Merge branch 'master' of https://github.com/fredrik-eriksson/zsnapper
This commit is contained in:
commit
f31472454b
@ -228,6 +228,7 @@ def send_snapshots(fslist, snapshots, config, sudo):
|
||||
log.info('{} successfully sent to remote'.format(fs))
|
||||
except zsnaplib.ZFSSnapshotError as e:
|
||||
log.warning(e)
|
||||
failed_snapshots.add(fs)
|
||||
return failed_snapshots
|
||||
|
||||
def weed_snapshots(fslist, snapshots, config, sudo, failed_snapshots):
|
||||
|
@ -46,7 +46,6 @@ def do_zfs_command(args, sudo, zfs_cmd, pipecmd=None):
|
||||
(out, err) = ctrl_proc.communicate()
|
||||
|
||||
if ctrl_proc.returncode != 0:
|
||||
print(proc.returncode)
|
||||
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
|
||||
return out
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user