openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

releasetools: Change the base_fs assertion into warnings. 

commit f54216f292 packed the base_fs files
into target_files.zip and added assertion to ensure the existence of the
files. We don't want to fail the OTA generation for the target_files.zip
without the base_fs files. Change the assertion into warnings instead.

Bug: 28547368
Change-Id: I6fd758a0a4fdfff02d1640fa46cf43d971627e26
This commit is contained in:
Tao Bao 2016-05-03 08:01:19 -07:00
parent 878775fd75
commit b079b50e2a
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/common.py
View File

@ -186,16 +186,22 @@ def LoadInfoDict(input_file, input_dir=None):
if "system_base_fs_file" in d:
basename = os.path.basename(d["system_base_fs_file"])
system_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(system_base_fs_file), \
"failed to find system base fs file: %s" % (system_base_fs_file,)
if os.path.exists(system_base_fs_file):
d["system_base_fs_file"] = system_base_fs_file
else:
print "Warning: failed to find system base fs file: %s" % (
system_base_fs_file,)
del d["system_base_fs_file"]
if "vendor_base_fs_file" in d:
basename = os.path.basename(d["vendor_base_fs_file"])
vendor_base_fs_file = os.path.join(input_dir, "META", basename)
assert os.path.exists(vendor_base_fs_file), \
"failed to find vendor base fs file: %s" % (vendor_base_fs_file,)
if os.path.exists(vendor_base_fs_file):
d["vendor_base_fs_file"] = vendor_base_fs_file
else:
print "Warning: failed to find vendor base fs file: %s" % (
vendor_base_fs_file,)
del d["vendor_base_fs_file"]
try:
data = read_helper("META/imagesizes.txt")