StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "GetBootImageBuildProp returns None if file does not exist"

Browse Source
This commit is contained in:
Yifan Hong
2021-01-13 19:40:13 +00:00
committed by Gerrit Code Review
parent 75232ce489 7dc5117ffd
commit 7a27574e5f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/common.py
View File

@@ -3672,14 +3672,13 @@ def GetBootImageBuildProp(boot_img):
RunAndCheckOutput(['toybox', 'cpio', '-F', abs_uncompressed_ramdisk, '-i'], RunAndCheckOutput(['toybox', 'cpio', '-F', abs_uncompressed_ramdisk, '-i'],
cwd=extracted_ramdisk) cwd=extracted_ramdisk)
prop_file = None
for search_path in RAMDISK_BUILD_PROP_REL_PATHS: for search_path in RAMDISK_BUILD_PROP_REL_PATHS:
prop_file = os.path.join(extracted_ramdisk, search_path) prop_file = os.path.join(extracted_ramdisk, search_path)
if os.path.isfile(prop_file): if os.path.isfile(prop_file):
break return prop_file
logger.warning('Unable to get boot image timestamp: no %s in ramdisk', search_path) logger.warning('Unable to get boot image timestamp: no %s in ramdisk', search_path)
return prop_file return None
except ExternalError as e: except ExternalError as e:
logger.warning('Unable to get boot image build props: %s', e) logger.warning('Unable to get boot image build props: %s', e)