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

Commit aa651b93 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use zip2zip to copy zipfiles" am: a59e5b7a am: 8c53b320 

Original change: https://android-review.googlesource.com/c/platform/build/+/2439632



Change-Id: Iec87d556be8d028464c81d377d65241fca254057
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d1b9531f 8c53b320

tools/releasetools/common.py

+7 −6
Original line number Diff line number Diff line
@@ -302,6 +302,8 @@ def RunAndCheckOutput(args, verbose=None, **kwargs): 
  Raises:

    ExternalError: On non-zero exit from the command.

  """

  if verbose is None:

    verbose = OPTIONS.verbose

  proc = Run(args, verbose=verbose, **kwargs)

  output, _ = proc.communicate()

  if output is None:
@@ -2903,13 +2905,12 @@ def ZipDelete(zip_filename, entries, force=False): 


    fd, new_zipfile = tempfile.mkstemp(dir=os.path.dirname(zip_filename))

    os.close(fd)

    cmd = ["zip2zip", "-i", zip_filename, "-o", new_zipfile]

    for entry in entries:

      cmd.append("-x")

      cmd.append(entry)

    RunAndCheckOutput(cmd)



    with zipfile.ZipFile(new_zipfile, 'w') as zout:

      for item in zin.infolist():

        if item.filename in entries:

          continue

        buffer = zin.read(item.filename)

        zout.writestr(item, buffer)



  os.replace(new_zipfile, zip_filename)