still making both branches closer

[nepi.git] / src / nepi / resources / linux / rpmfuncs.py

diff --git a/src/nepi/resources/linux/rpmfuncs.py b/src/nepi/resources/linux/rpmfuncs.py
index 5497a57..ae70e75 100644 (file)
--- a/src/nepi/resources/linux/rpmfuncs.py
+++ b/src/nepi/resources/linux/rpmfuncs.py
@@ -3,9 +3,8 @@
 #    Copyright (C) 2013 INRIA
 #
 #    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
+#    it under the terms of the GNU General Public License version 2 as
+#    published by the Free Software Foundation;
 #
 #    This program is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +18,8 @@
 
 RPM_FUSION_URL = 'http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-stable.noarch.rpm'
 RPM_FUSION_URL_F12 = 'http://download1.rpmfusion.org/free/fedora/releases/12/Everything/x86_64/os/rpmfusion-free-release-12-1.noarch.rpm'
+RPM_FUSION_URL_F14 = 'http://download1.rpmfusion.org/free/fedora/releases/14/Everything/x86_64/os/rpmfusion-free-release-14-0.4.noarch.rpm'
+
 
 # TODO: Investigate using http://nixos.org/nix/
 
@@ -27,10 +28,9 @@ def install_packages_command(os, packages):
         packages = [packages]
 
     cmd = install_rpmfusion_command(os)
-    if cmd: cmd += " && "
-    cmd += " && ".join(map(lambda p: 
-            " { rpm -q %(package)s || sudo -S yum -y install %(package)s ; } " % {
-                    'package': p}, packages))
+    if cmd: cmd += " ; "
+    cmd += " && ".join([" { rpm -q %(package)s || sudo -S yum -y install --nogpgcheck %(package)s ; } " % {
+                    'package': p} for p in packages])
     
     #cmd = { rpm -q rpmfusion-free-release || sudo -s rpm -i ... ; } && { rpm -q vim || sudo yum -y install vim ; } && ..
     return cmd 
@@ -39,9 +39,8 @@ def remove_packages_command(os, packages):
     if not isinstance(packages, list):
         packages = [packages]
 
-    cmd = " && ".join(map(lambda p: 
-            " { rpm -q %(package)s && sudo -S yum -y remove %(package)s ; } " % {
-                    'package': p}, packages))
+    cmd = " && ".join([" { rpm -q %(package)s && sudo -S yum -y remove %(package)s ; } " % {
+                    'package': p} for p in packages])
         
     #cmd = { rpm -q vim && sudo yum -y remove vim ; } && ..
     return cmd 
@@ -49,17 +48,20 @@ def remove_packages_command(os, packages):
 def install_rpmfusion_command(os):
     from nepi.resources.linux.node import OSType
 
-    cmd = " { rpm -q rpmfusion-free-release ||  sudo -S rpm -i %(package)s ; } "
+    cmd = " { rpm -q rpmfusion-free-release || sudo -S rpm -i %(package)s ; } "
 
-    if os in [OSType.FEDORA, OSType.FEDORA_12]:
+    if (os & OSType.FEDORA_8):
+        # RpmFusion for Fedora 8 is unmaintained 
+        cmd = ""
+    elif (os & OSType.FEDORA_12):
         # For f12
         cmd =  cmd %  {'package': RPM_FUSION_URL_F12}
-    elif os == OSType.FEDORA_14:
-        # For f13+
-        cmd = cmd %  {'package': RPM_FUSION_URL}
+    elif (os & OSType.FEDORA_14):
+        # For f14
+        cmd = cmd %  {'package': RPM_FUSION_URL_F14}
     else:
-        # Fedora 8 is unmaintained 
-        cmd = ""
+        # For f14+
+        cmd = cmd %  {'package': RPM_FUSION_URL}
 
     return cmd