Clean up of repo

[nepi.git] / src / nepi / testbeds / planetlab / node.py

diff --git a/src/nepi/testbeds/planetlab/node.py b/src/nepi/testbeds/planetlab/node.py
index bc26252..a73f6ab 100644 (file)
--- a/src/nepi/testbeds/planetlab/node.py
+++ b/src/nepi/testbeds/planetlab/node.py
@@ -478,7 +478,7 @@ class Node(object):
                     RPM_FUSION_URL = self.RPM_FUSION_URL
                     
                 rpmFusion = (
-                  'rpm -q $(rpm -q -p %(RPM_FUSION_URL)s) || sudo -S rpm -i %(RPM_FUSION_URL)s'
+                  'rpm -q rpmfusion-free-release || sudo -S rpm -i %(RPM_FUSION_URL)s'
                 ) % {
                     'RPM_FUSION_URL' : RPM_FUSION_URL
                 }
@@ -619,9 +619,7 @@ class Node(object):
         for cmd in cmds:
             (out,err),proc = server.popen_ssh_command(
                 # Some apps need two kills
-                cmd % {
-                    'slicename' : self.slicename ,
-                },
+                cmd,
                 host = self.hostip,
                 port = None,
                 user = self.slicename,
@@ -820,8 +818,9 @@ class Node(object):
 
     def check_bad_host(self, out, err):
         badre = re.compile(r'(?:'
-                           r"curl: [(]\d+[)] Couldn't resolve host 'download1[.]rpmfusion[.]org'"
+                           #r"curl: [(]\d+[)] Couldn't resolve host 'download1[.]rpmfusion[.]org'"
                            r'|Error: disk I/O error'
                            r')', 
                            re.I)
         return badre.search(out) or badre.search(err)
+