mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-01 14:53:54 -06:00
tests/functional: move uncompress handling into new uncompress.py file
More uncompress related code will be added shortly, so having a separate file makes more sense. The utils.py imports the functions from archive.py, so that existing callers don't need to be modified. This avoids redundant code churn until later in the series when all calls will be adapted for other reasons. Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-ID: <20241217155953.3950506-18-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
cfcb4484fc
commit
ba32e50a1b
2 changed files with 38 additions and 25 deletions
|
@ -8,13 +8,12 @@
|
|||
# This work is licensed under the terms of the GNU GPL, version 2 or
|
||||
# later. See the COPYING file in the top-level directory.
|
||||
|
||||
import gzip
|
||||
import lzma
|
||||
import os
|
||||
import shutil
|
||||
|
||||
from .archive import tar_extract as archive_extract
|
||||
from .archive import cpio_extract
|
||||
from .uncompress import gzip_uncompress
|
||||
from .uncompress import lzma_uncompress
|
||||
|
||||
"""
|
||||
Round up to next power of 2
|
||||
|
@ -36,25 +35,3 @@ def image_pow2ceil_expand(path):
|
|||
if size != size_aligned:
|
||||
with open(path, 'ab+') as fd:
|
||||
fd.truncate(size_aligned)
|
||||
|
||||
def gzip_uncompress(gz_path, output_path):
|
||||
if os.path.exists(output_path):
|
||||
return
|
||||
with gzip.open(gz_path, 'rb') as gz_in:
|
||||
try:
|
||||
with open(output_path, 'wb') as raw_out:
|
||||
shutil.copyfileobj(gz_in, raw_out)
|
||||
except:
|
||||
os.remove(output_path)
|
||||
raise
|
||||
|
||||
def lzma_uncompress(xz_path, output_path):
|
||||
if os.path.exists(output_path):
|
||||
return
|
||||
with lzma.open(xz_path, 'rb') as lzma_in:
|
||||
try:
|
||||
with open(output_path, 'wb') as raw_out:
|
||||
shutil.copyfileobj(lzma_in, raw_out)
|
||||
except:
|
||||
os.remove(output_path)
|
||||
raise
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue