X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Frpmfuncs.py;h=4d22bc34996cc282c1c1bb2f9b6fb82df9b559a5;hb=e55924b6886bd7382a28e1ae235c4810f852e163;hp=35aeb612c5b721911ee1a6ab2d69da3e5a2cd8f6;hpb=5afea61e207061be0647ac4ea98f8c9683b03f24;p=nepi.git

diff --git a/src/nepi/resources/linux/rpmfuncs.py b/src/nepi/resources/linux/rpmfuncs.py
index 35aeb612..4d22bc34 100644
--- 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
@@ -53,18 +52,18 @@ def install_rpmfusion_command(os):
 
     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:
+    elif (os & OSType.FEDORA_14):
         # For f14
         cmd = cmd %  {'package': RPM_FUSION_URL_F14}
-    elif os == OSType.FEDORA:
+    else:
         # For f14+
         cmd = cmd %  {'package': RPM_FUSION_URL}
-    else:
-        # Fedora 8 is unmaintained 
-        cmd = ""
 
     return cmd