psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compatibility issue between pykwalify and ruamel.yaml 0.15.52 (#85).

Browse source
This commit is contained in:
Dan Helfman 2018-08-11 13:59:27 -07:00
parent ece5608677
commit 7b77fd2510
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
NEWS
View file

@ -1,3 +1,7 @@
1.2.2
* #85: Fix compatibility issue between pykwalify and ruamel.yaml 0.15.52, which manifested in
borgmatic as a pykwalify RuleError.
1.2.1 1.2.1
* Skip before/after backup hooks when only doing --prune, --check, --list, and/or --info. * Skip before/after backup hooks when only doing --prune, --check, --list, and/or --info.
* #71: Support for XDG_CONFIG_HOME environment variable for specifying alternate user ~/.config/ * #71: Support for XDG_CONFIG_HOME environment variable for specifying alternate user ~/.config/

4
borgmatic/config/validate.py
View file

@ -74,8 +74,8 @@ def parse_configuration(config_filename, schema_filename):
logging.getLogger('pykwalify').setLevel(logging.ERROR) logging.getLogger('pykwalify').setLevel(logging.ERROR)
try: try:
config = yaml.round_trip_load(open(config_filename)) config = yaml.safe_load(open(config_filename))
schema = yaml.round_trip_load(open(schema_filename)) schema = yaml.safe_load(open(schema_filename))
except yaml.error.YAMLError as error: except yaml.error.YAMLError as error:
raise Validation_error(config_filename, (str(error),)) raise Validation_error(config_filename, (str(error),))

2
setup.py
View file

@ -1,7 +1,7 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
VERSION = '1.2.1' VERSION = '1.2.2'
setup( setup(