Merge with head

diff --combined src/nepi/testbeds/planetlab/node.py
index 4936491,b8407e2..61c73e8
--- 1/src/nepi/testbeds/planetlab/node.py
--- 2/src/nepi/testbeds/planetlab/node.py
+++ b/src/nepi/testbeds/planetlab/node.py
@@@ -322,15 -322,7 +322,15 @@@ class Node(object)
      
      def unassign_node(self):
          self._node_id = None
 -        self.__dict__.update(self.__orig_attrs)
 +        
 +        try:
 +            orig_attrs = self.__orig_attrs
 +        except AttributeError:
 +            return
 +            
 +        for key, value in __orig_attrs.iteritems():
 +            setattr(self, key, value)
 +        del self.__orig_attrs
      
      def rate_nodes(self, nodes):
          rates = collections.defaultdict(int)
@@@ -404,10 -396,7 +404,10 @@@
              orig_attrs['server_key'] = self.server_key
              self.server_key = info['ssh_rsa_key']
          
 -        self.__orig_attrs = orig_attrs
 +        try:
 +            self.__orig_attrs
 +        except AttributeError:
 +            self.__orig_attrs = orig_attrs
  
      def validate(self):
          if self.home_path is None:
@@@ -443,7 -432,7 +443,7 @@@
                      RPM_FUSION_URL = self.RPM_FUSION_URL
                      
                  rpmFusion = (
-                   '( rpm -q $(rpm -q -p %(RPM_FUSION_URL)s) || rpm -i %(RPM_FUSION_URL)s ) &&'
+                   'sudo -S rpm -q $(rpm -q -p %(RPM_FUSION_URL)s) || rpm -i %(RPM_FUSION_URL)s'
                  ) % {
                      'RPM_FUSION_URL' : RPM_FUSION_URL
                  }