Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
1290623456
|
|||
2a91a41ede
|
|||
46eed410f0
|
@ -259,7 +259,7 @@ def weed_snapshots(fslist, snapshots, config, failed_snapshots):
|
||||
continue
|
||||
if source_fs not in snapshots:
|
||||
continue
|
||||
if not conf['weed_enable']:
|
||||
if not conf['weed_enable'] or conf['weed_enable'].lower() in ('false', 'no'):
|
||||
continue
|
||||
|
||||
kwargs = {k: int(v) for k, v in conf.items() if k in [
|
||||
|
2
setup.py
2
setup.py
@ -6,7 +6,7 @@ try:
|
||||
except ImportError:
|
||||
from distutils import setup
|
||||
|
||||
version = '0.3.3'
|
||||
version = '0.3.4'
|
||||
|
||||
setup(
|
||||
name='zsnapper',
|
||||
|
@ -37,7 +37,7 @@ def do_zfs_command(args, zfs_cmd, pipecmd=None):
|
||||
# check if we try to create a snapshot that already exists. This can happen
|
||||
# if the script is run every minute and it takes more time than that to
|
||||
# create all snapshots
|
||||
if ctrl_proc.returncode == 1 and re_match(re_err_ok, err):
|
||||
if ctrl_proc.returncode == 1 and re.match(re_err_ok, err.decode('utf-8')):
|
||||
pass
|
||||
elif ctrl_proc.returncode != 0:
|
||||
raise ZFSSnapshotError('Failed to execute {}: {}'.format(cmd, err))
|
||||
|
Reference in New Issue
Block a user