From 799b0b4ad65d73e45f9d63f1ce5a05cd18c8cab4 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Fri, 20 Jan 2017 21:43:19 +0000
Subject: [PATCH] Fix merging of includes when parsing XML.

Incorrect use of addChild was causing overlaid properties not to be
merged correctly when performing an include.
---
 catalog/sgprops.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/catalog/sgprops.py b/catalog/sgprops.py
index fcf140e..f523657 100644
--- a/catalog/sgprops.py
+++ b/catalog/sgprops.py
@@ -179,7 +179,9 @@ class PropsHandler(handler.ContentHandler):
 
             self._current = self._current.getChild(name, index, create=True)
         else:
-            self._current = self._current.addChild(name)
+            # important we use getChild here, so that includes are resolved
+            # correctly
+            self._current = self._current.getChild(name, create=True)
 
         self._currentTy = None;
         if 'type' in attrs.keys():