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

Commit 7dc5117f authored by Yifan Hong's avatar Yifan Hong
Browse files

GetBootImageBuildProp returns None if file does not exist 

If system/etc/ramdisk/build.prop does not exist in the ramdisk,
GetBootImageBuildProp should return None instead of a path
to a non-existant file.

Test: pass
Bug: 177171706
Change-Id: I34e447bc315d203e136e8c0d59d00961f81301e3
parent c275c68d

tools/releasetools/common.py

+2 −3
Original line number Diff line number Diff line
@@ -3672,14 +3672,13 @@ def GetBootImageBuildProp(boot_img): 
    RunAndCheckOutput(['toybox', 'cpio', '-F', abs_uncompressed_ramdisk, '-i'],

               cwd=extracted_ramdisk)



    prop_file = None

    for search_path in RAMDISK_BUILD_PROP_REL_PATHS:

      prop_file = os.path.join(extracted_ramdisk, search_path)

      if os.path.isfile(prop_file):

        break

        return prop_file

      logger.warning('Unable to get boot image timestamp: no %s in ramdisk', search_path)



    return prop_file

    return None



  except ExternalError as e:

    logger.warning('Unable to get boot image build props: %s', e)