git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FdNetDevice working with PlanetLab TAPs
[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
35aeb61
..
5d17b31
100644
(file)
--- a/
src/nepi/resources/linux/rpmfuncs.py
+++ b/
src/nepi/resources/linux/rpmfuncs.py
@@
-53,18
+53,18
@@
def install_rpmfusion_command(os):
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}
# 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}
# For f14
cmd = cmd % {'package': RPM_FUSION_URL_F14}
- el
if os == OSType.FEDORA
:
+ el
se
:
# For f14+
cmd = cmd % {'package': RPM_FUSION_URL}
# For f14+
cmd = cmd % {'package': RPM_FUSION_URL}
- else:
- # Fedora 8 is unmaintained
- cmd = ""
return cmd
return cmd