4 Commits
3 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -375,8 +375,6 @@ def main():
snapshots = zsnaplib.get_snapshots(local_zfs_cmd) snapshots = zsnaplib.get_snapshots(local_zfs_cmd)
failed_send = send_snapshots(fslist, snapshots, config) failed_send = send_snapshots(fslist, snapshots, config)
if failed_send:
ret = RET_CODES['ERROR']
failed_snapshots.update(failed_send) failed_snapshots.update(failed_send)
for remote in remotes.keys(): for remote in remotes.keys():
failed_send = send_snapshots( failed_send = send_snapshots(
@@ -397,6 +395,7 @@ def main():
failed_snapshots) failed_snapshots)
os.remove(lockfile) os.remove(lockfile)
return ret
if __name__ == '__main__': if __name__ == '__main__':
log = logging.getLogger(LOGGER) log = logging.getLogger(LOGGER)
@@ -409,7 +408,7 @@ if __name__ == '__main__':
for logsocket in ('/var/run/log', '/dev/log'): for logsocket in ('/var/run/log', '/dev/log'):
try: try:
mode = os.stat(logsocket).st_mode mode = os.stat(logsocket).st_mode
except FileNotFoundError: except (PermissionError, FileNotFoundError):
continue continue
if stat.S_ISSOCK(mode): if stat.S_ISSOCK(mode):
+1 -1
View File
@@ -6,7 +6,7 @@ try:
except ImportError: except ImportError:
from distutils import setup from distutils import setup
version = '0.3.4' version = '0.3.7'
setup( setup(
name='zsnapper', name='zsnapper',
+1 -1
View File
@@ -93,7 +93,7 @@ def get_snapshots(zfs_cmd):
snapshots = {} snapshots = {}
for row in out.splitlines(): for row in out.splitlines():
row = row.decode('UTF-8').split()[0] row = row.decode('UTF-8').split('\t')[0]
res = re_snapshot.match(row) res = re_snapshot.match(row)
if res: if res:
d = datetime.datetime.strptime(res.group(2), time_format) d = datetime.datetime.strptime(res.group(2), time_format)