feffe/zsnapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases 7 Wiki Activity

Merge branch 'master' of https://github.com/fredrik-eriksson/zsnapper

Browse Source
This commit is contained in:
Fredrik Eriksson 2018-12-27 07:55:38 +01:00
commit f31472454b
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/zsnapper
View File

@ -228,6 +228,7 @@ def send_snapshots(fslist, snapshots, config, sudo):
log.info('{} successfully sent to remote'.format(fs)) log.info('{} successfully sent to remote'.format(fs))
except zsnaplib.ZFSSnapshotError as e: except zsnaplib.ZFSSnapshotError as e:
log.warning(e) log.warning(e)
failed_snapshots.add(fs)
return failed_snapshots return failed_snapshots
def weed_snapshots(fslist, snapshots, config, sudo, failed_snapshots): def weed_snapshots(fslist, snapshots, config, sudo, failed_snapshots):

1
zsnaplib/__init__.py
View File

@ -46,7 +46,6 @@ def do_zfs_command(args, sudo, zfs_cmd, pipecmd=None):
(out, err) = ctrl_proc.communicate() (out, err) = ctrl_proc.communicate()
if ctrl_proc.returncode != 0: if ctrl_proc.returncode != 0:
print(proc.returncode)
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err)) raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
return out return out