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

Commit fdb8f17a authored by Cole Faust's avatar Cole Faust Committed by Gerrit Code Review
Browse files

Merge "Prepare release tools for python 3"

parents 11b78c16 b820bcd8

tools/releasetools/check_target_files_vintf.py

+10 −2
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ def CheckVintfFromExtractedTargetFiles(input_tmp, info_dict=None): 
      'checkvintf',

      'checkvintf',

      '--check-compat',

      '--check-compat',

  ]

  ]

  for device_path, real_path in dirmap.items():

  for device_path, real_path in sorted(dirmap.items()):

    common_command += ['--dirmap', '{}:{}'.format(device_path, real_path)]

    common_command += ['--dirmap', '{}:{}'.format(device_path, real_path)]

  common_command += kernel_args

  common_command += kernel_args

  common_command += shipping_api_level_args

  common_command += shipping_api_level_args
@@ -165,7 +165,15 @@ def GetVintfFileList(): 
  def PathToPatterns(path):

  def PathToPatterns(path):

    if path[-1] == '/':

    if path[-1] == '/':

      path += '*'

      path += '*'

    for device_path, target_files_rel_paths in DIR_SEARCH_PATHS.items():



    # Loop over all the entries in DIR_SEARCH_PATHS and find one where the key

    # is a prefix of path. In order to get find the correct prefix, sort the

    # entries by decreasing length of their keys, so that we check if longer

    # strings are prefixes before shorter strings. This is so that keys that

    # are substrings of other keys (like /system vs /system_ext) are checked

    # later, and we don't mistakenly mark a path that starts with /system_ext

    # as starting with only /system.

    for device_path, target_files_rel_paths in sorted(DIR_SEARCH_PATHS.items(), key=lambda i: len(i[0]), reverse=True):

      if path.startswith(device_path):

      if path.startswith(device_path):

        suffix = path[len(device_path):]

        suffix = path[len(device_path):]

        return [rel_path + suffix for rel_path in target_files_rel_paths]

        return [rel_path + suffix for rel_path in target_files_rel_paths]

tools/releasetools/common.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -2105,7 +2105,9 @@ def GetKeyPasswords(keylist): 
  need_passwords = []

  need_passwords = []

  key_passwords = {}

  key_passwords = {}

  devnull = open("/dev/null", "w+b")

  devnull = open("/dev/null", "w+b")

  for k in sorted(keylist):



  # sorted() can't compare strings to None, so convert Nones to strings

  for k in sorted(keylist, key=lambda x: x if x is not None else ""):

    # We don't need a password for things that aren't really keys.

    # We don't need a password for things that aren't really keys.

    if k in SPECIAL_CERT_STRINGS or k is None:

    if k in SPECIAL_CERT_STRINGS or k is None:

      no_passwords.append(k)

      no_passwords.append(k)

tools/releasetools/ota_utils.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -154,7 +154,7 @@ def WriteMetadata(metadata_proto, output): 
                compress_type=zipfile.ZIP_STORED)

                compress_type=zipfile.ZIP_STORED)

    return

    return





  with open('{}.pb'.format(output), 'w') as f:

  with open('{}.pb'.format(output), 'wb') as f:

    f.write(metadata_proto.SerializeToString())

    f.write(metadata_proto.SerializeToString())

  with open(output, 'w') as f:

  with open(output, 'w') as f:

    f.write(legacy_metadata)

    f.write(legacy_metadata)