From 7b77fd251036b797c0026f74b90b99169170add6 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Sat, 11 Aug 2018 13:59:27 -0700
Subject: [PATCH] Fix compatibility issue between pykwalify and ruamel.yaml
 0.15.52 (#85).

---
 NEWS                         | 4 ++++
 borgmatic/config/validate.py | 4 ++--
 setup.py                     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 31c51801..f4e03adc 100644
--- a/NEWS
+++ b/NEWS
@@ -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
  * 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/
diff --git a/borgmatic/config/validate.py b/borgmatic/config/validate.py
index bdbbbf78..bb4ab4f3 100644
--- a/borgmatic/config/validate.py
+++ b/borgmatic/config/validate.py
@@ -74,8 +74,8 @@ def parse_configuration(config_filename, schema_filename):
     logging.getLogger('pykwalify').setLevel(logging.ERROR)
 
     try:
-        config = yaml.round_trip_load(open(config_filename))
-        schema = yaml.round_trip_load(open(schema_filename))
+        config = yaml.safe_load(open(config_filename))
+        schema = yaml.safe_load(open(schema_filename))
     except yaml.error.YAMLError as error:
         raise Validation_error(config_filename, (str(error),))
 
diff --git a/setup.py b/setup.py
index 1f0ee255..329b07cc 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 
-VERSION = '1.2.1'
+VERSION = '1.2.2'
 
 
 setup(