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

Commit 2ab6986d authored by Kelvin Zhang's avatar Kelvin Zhang
Browse files

Make non-ab code path compatible with extracted target files 

Bug: 296485685
Test: ota_from_target_files -v -i non_ab.zip non_ab.zip ota.zip
Change-Id: I13ed54bfe7d14d2d1e87f45564da465a77bc2d1d
parent 57f23bf3

tools/releasetools/common.py

+4 −14
Original line number Diff line number Diff line
@@ -1235,12 +1235,7 @@ def _FindAndLoadRecoveryFstab(info_dict, input_file, read_helper): 
  system_root_image = info_dict.get('system_root_image') == 'true'

  if info_dict.get('no_recovery') != 'true':

    recovery_fstab_path = 'RECOVERY/RAMDISK/system/etc/recovery.fstab'

    if isinstance(input_file, zipfile.ZipFile):

      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):

    if not DoesInputFileContain(input_file, recovery_fstab_path):

      recovery_fstab_path = 'RECOVERY/RAMDISK/etc/recovery.fstab'

    return LoadRecoveryFSTab(

        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':

    recovery_fstab_path = 'BOOT/RAMDISK/system/etc/recovery.fstab'

    if isinstance(input_file, zipfile.ZipFile):

      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):

    if not DoesInputFileContain(input_file, recovery_fstab_path):

      recovery_fstab_path = 'BOOT/RAMDISK/etc/recovery.fstab'

    return LoadRecoveryFSTab(

        read_helper, info_dict['fstab_version'], recovery_fstab_path,