Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/reflink: inline and simplify _cmd()

Browse Source
This commit is contained in:
Rusty Bird 2018-09-11 23:50:12 +00:00
parent fb06a8089a
commit 69af0a48ec
No known key found for this signature in database
GPG Key ID: 469D78F47AAF2ADF
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qubes/storage/reflink.py
View File

@ -409,19 +409,10 @@ def _copy_file(src, dst):
raise FileNotFoundError(src) raise FileNotFoundError(src)
with _replace_file(dst) as tmp: with _replace_file(dst) as tmp:
LOGGER.info('Copying file: %s -> %s', src, tmp.name) LOGGER.info('Copying file: %s -> %s', src, tmp.name)
_cmd('cp', '--sparse=always', '--reflink=auto', src, tmp.name) cmd = 'cp', '--sparse=always', '--reflink=auto', src, tmp.name
p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
def _cmd(*args): if p.returncode != 0:
''' Run command until finished; return stdout (as bytes) if it raise qubes.storage.StoragePoolException(str(p))
exited 0. Otherwise, raise a detailed StoragePoolException.
'''
try:
return subprocess.run(args, check=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE).stdout
except subprocess.CalledProcessError as ex:
msg = '{} err={!r} out={!r}'.format(ex, ex.stderr, ex.stdout)
raise qubes.storage.StoragePoolException(msg) from ex
def is_reflink_supported(dst_dir, src_dir=None): def is_reflink_supported(dst_dir, src_dir=None):
''' Return whether destination directory supports reflink copies ''' Return whether destination directory supports reflink copies