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

Make non-ab code path compatible with extracted target files

Browse Source 
Bug: 296485685
Test: ota_from_target_files -v -i non_ab.zip non_ab.zip ota.zip
Change-Id: I13ed54bfe7d14d2d1e87f45564da465a77bc2d1d
This commit is contained in:
Kelvin Zhang
2023-10-27 10:58:05 -07:00
parent 57f23bf317
commit 2ab6986dd9
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/releasetools/common.py
View File

@@ -1235,12 +1235,7 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper):
system_root_image = info_dict.get('system_root_image') == 'true' system_root_image = info_dict.get('system_root_image') == 'true'
if info_dict.get('no_recovery') != 'true': if info_dict.get('no_recovery') != 'true':
recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab' recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab'
if isinstance(input_file, zipfile.ZipFile): if not DoesInputFileContain(input_file, recovery_fstab_path):
if recovery_fstab_path not in input_file.namelist():
recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'
else:
path = os.path.join(input_file, *recovery_fstab_path.split('/'))
if not os.path.exists(path):
recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab' recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'
return LoadRecoveryFSTab( return LoadRecoveryFSTab(
read_helper, info_dict['fstab_version'], recovery_fstab_path, read_helper, info_dict['fstab_version'], recovery_fstab_path,
@@ -1248,12 +1243,7 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper):
if info_dict.get('recovery_as_boot') == 'true': if info_dict.get('recovery_as_boot') == 'true':
recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab' recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab'
if isinstance(input_file, zipfile.ZipFile): if not DoesInputFileContain(input_file, recovery_fstab_path):
if recovery_fstab_path not in input_file.namelist():
recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'
else:
path = os.path.join(input_file, *recovery_fstab_path.split('/'))
if not os.path.exists(path):
recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab' recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'
return LoadRecoveryFSTab( return LoadRecoveryFSTab(
read_helper, info_dict['fstab_version'], recovery_fstab_path, read_helper, info_dict['fstab_version'], recovery_fstab_path,