still making both branches closer

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

diff --git a/src/nepi/resources/linux/debfuncs.py b/src/nepi/resources/linux/debfuncs.py
index 02d1657..9b5901c 100644 (file)
--- a/src/nepi/resources/linux/debfuncs.py
+++ b/src/nepi/resources/linux/debfuncs.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
@@ -23,9 +22,8 @@ def install_packages_command(os, packages):
     if not isinstance(packages, list):
         packages = [packages]
 
-    cmd = " && ".join(map(lambda p: 
-            " { dpkg -s %(package)s || sudo -S apt-get -y install %(package)s ; } " % {
-                    'package': p}, packages))
+    cmd = " && ".join([" { dpkg -s %(package)s || sudo -S apt-get -y install %(package)s ; } " % {
+                    'package': p} for p in packages])
         
     #cmd = { dpkg -s vim || sudo -S apt-get -y install vim ; } && ..
     return cmd 
@@ -34,9 +32,8 @@ def remove_packages_command(os, packages):
     if not isinstance(packages, list):
         packages = [packages]
 
-    cmd = " && ".join(map(lambda p: 
-            " { dpkg -s %(package)s && sudo -S apt-get -y purge %(package)s ; } " % {
-                    'package': p}, packages))
+    cmd = " && ".join([" { dpkg -s %(package)s && sudo -S apt-get -y purge %(package)s ; } " % {
+                    'package': p} for p in packages])
         
     #cmd = { dpkg -s vim && sudo -S apt-get -y purge vim ; } && ..
     return cmd