Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 144099f7 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Fix releasetools device_specific error case 

When the specified device_specific code isn't found, handle the error
with a log statement rather than a NoneType exception.

Fixes: 390497895
Test: treehugger
Change-Id: Id5925f4e9ec9ae35d217823fc32f1ac7f06f1652
parent 5e393716

tools/releasetools/common.py

+2 −0
Original line number Diff line number Diff line
@@ -3138,6 +3138,8 @@ class DeviceSpecificParams(object): 
        if not os.path.exists(path) and os.path.exists(path + ".py"):

          path = path + ".py"

        spec = importlib.util.spec_from_file_location("device_specific", path)

        if not spec:

          raise FileNotFoundError(path)

        logger.info("loaded device-specific extensions from %s", path)

        module = importlib.util.module_from_spec(spec)

        spec.loader.exec_module(module)

tools/releasetools/test_common.py

+8 −0
Original line number Diff line number Diff line
@@ -2157,3 +2157,11 @@ class PartitionBuildPropsTest(test_utils.ReleaseToolsTestCase): 
        'google/coral/coral:10/RP1A.200325.001/6337676:user/dev-keys',

        'ro.product.odm.device': 'coral',

    }, copied_props.build_props)





class DeviceSpecificParamsTest(test_utils.ReleaseToolsTestCase):



  def test_missingSource(self):

    common.OPTIONS.device_specific = '/does_not_exist'

    ds = DeviceSpecificParams()

    self.assertIsNone(ds.module)