From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Fri, 11 Nov 2011 03:43:22 +0000 (-0500)
Subject: fix merge
X-Git-Tag: sfa-1.1-3~44
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=37e3aa340adc25a9f153217be91aa5a18d77e2e3

fix merge
---

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index e6266f81..ea38f698 100644
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -191,7 +191,7 @@ class SFAv1(BaseVersion):
         for network in networks:
             current_network = network.get('name')
             if current_network and current_network not in current_networks:
-                self.xml.root.append(network)
+                self.xml.root.append(network.element)
                 current_networks.append(current_network)
 
 if __name__ == '__main__':
diff --git a/sfa/util/xml.py b/sfa/util/xml.py
index d2bb6a7a..cc23e5f8 100755
--- a/sfa/util/xml.py
+++ b/sfa/util/xml.py
@@ -56,7 +56,10 @@ class XmlNode:
         return XmlNode(element, self.namespaces)
 
     def append(self, elem):
-        self.node.append(elem)
+        if isinstance(elem, XmlNode):
+            self.node.append(elem.node)
+        else:
+            self.node.append(elem)
 
     def remove_elements(name):
         """