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

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

Merge "Fix ota build error when using boot variable files" am: 775187f9 am: fc7314a6

parents 0e198abb fc7314a6
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -723,7 +723,16 @@ def ExtractFromInputFile(input_file, fn):
    with open(tmp_file, 'wb') as f:
      f.write(input_file.read(fn))
    return tmp_file
  elif zipfile.is_zipfile(input_file):
    with zipfile.ZipFile(input_file, "r", allowZip64=True) as zfp:
      tmp_file = MakeTempFile(os.path.basename(fn))
      with open(tmp_file, "wb") as fp:
        fp.write(zfp.read(fn))
      return tmp_file
  else:
    if not os.path.isdir(input_file):
      raise ValueError(
          "Invalid input_file, accepted inputs are ZipFile object, path to .zip file on disk, or path to extracted directory. Actual: " + input_file)
    file = os.path.join(input_file, *fn.split("/"))
    if not os.path.exists(file):
      raise KeyError(fn)