nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backups: Dont fail when borg doesn't find files to extract

Browse Source 
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Michael Pimmer 2018-10-10 10:31:14 +00:00 committed by James Valleroy
parent c770a7adfb
commit a350ab200e
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
actions/backups
View File

@ -149,7 +149,17 @@ def _extract(archive_path, destination, locations=None):
print(borg_call) print(borg_call)
try: try:
os.chdir(os.path.expanduser(destination)) os.chdir(os.path.expanduser(destination))
subprocess.run(borg_call, env=env, check=True) # TODO: with python 3.7 use subprocess.run with the 'capture_output'
# argument
process = subprocess.run(borg_call, env=env,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
if process.returncode != 0:
error = process.stderr.decode()
# Don't fail on the borg error when no files were matched
if "never matched" not in error:
raise subprocess.CalledProcessError(process.returncode,
process.args)
finally: finally:
os.chdir(prev_dir) os.chdir(prev_dir)