Compare commits
No commits in common. "master" and "v0.3.4" have entirely different histories.
@ -369,9 +369,9 @@ def main():
|
||||
try:
|
||||
if remote in remote_snapshots:
|
||||
remote_snapshots[remote] = zsnaplib.get_snapshots(zfs_cmd)
|
||||
except zsnaplib.ZFSSnapshotError as e:
|
||||
except zsnaplib.ZFSSnapshotError:
|
||||
del remote_snapshots[remote]
|
||||
log.warning("Could not refresh snapshots on {}: {}".format(remote, e))
|
||||
log.warning("Could not refresh snapshots on {}".format(remote))
|
||||
snapshots = zsnaplib.get_snapshots(local_zfs_cmd)
|
||||
|
||||
failed_send = send_snapshots(fslist, snapshots, config)
|
||||
|
@ -83,7 +83,7 @@ def get_filesystems(zfs_cmd):
|
||||
|
||||
for row in out.splitlines():
|
||||
row = row.decode('UTF-8')
|
||||
ret.add(row.split('\t')[0])
|
||||
ret.add(row.split()[0])
|
||||
return ret
|
||||
|
||||
|
||||
@ -93,7 +93,7 @@ def get_snapshots(zfs_cmd):
|
||||
snapshots = {}
|
||||
|
||||
for row in out.splitlines():
|
||||
row = row.decode('UTF-8').split('\t')[0]
|
||||
row = row.decode('UTF-8').split()[0]
|
||||
res = re_snapshot.match(row)
|
||||
if res:
|
||||
d = datetime.datetime.strptime(res.group(2), time_format)
|
||||
|
Loading…
Reference in New Issue
Block a user