From bfe983b82d265dc3a9aadacea582456a765ef405 Mon Sep 17 00:00:00 2001
From: Artem30801 <artem30801@gmail.com>
Date: Sun, 5 Jan 2020 17:17:25 +0300
Subject: [PATCH] Validation upon merge

---
 config.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.py b/config.py
index 9f773c0..e091717 100644
--- a/config.py
+++ b/config.py
@@ -1,4 +1,5 @@
 import os
+import copy
 import collections
 
 from configobj import ConfigObj, Section, flatten_errors
@@ -249,8 +250,13 @@ class ConfigManager:
 
         self._load_comments(d, self.config)
 
-    def merge(self, config):
-        self.config.merge(config.config)
+    def merge(self, config, validate=True):
+        current = copy.deepcopy(self.config)
+        current.merge(config.config)
+        if validate:
+            self.validate_config(current)
+        else:
+            self.set_config(current)
 
 
 if __name__ == '__main__':