From: smbaker <smbaker@fc8clean.lan>
Date: Thu, 29 Dec 2011 03:40:06 +0000 (-0800)
Subject: Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
X-Git-Tag: sfa-2.0-7~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0d88de5aaee6820835f2d9770aab6c7392f14e21;hp=a4d5ded2b254cb654c1b6a48c29f7b145bbf2cc5;p=sfa.git

Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sfa
---

diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py
index ec279715..39bbac5b 100644
--- a/sfa/rspecs/versions/sfav1.py
+++ b/sfa/rspecs/versions/sfav1.py
@@ -93,6 +93,7 @@ class SFAv1(BaseVersion):
         attributes = []
         nodes_with_slivers = self.get_nodes_with_slivers()
         for default_attribute in self.get_default_sliver_attributes(network):
+            attribute = default_attribute.copy()
             attribute['node_id'] = None
             attributes.append(attribute)
         for node in nodes_with_slivers:
@@ -194,6 +195,9 @@ class SFAv1(BaseVersion):
         Merge contents for specified rspec with current rspec
         """
 
+        if not in_rspec:
+            return
+
         from sfa.rspecs.rspec import RSpec
         if isinstance(in_rspec, RSpec):
             rspec = in_rspec