X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Fccnd.py;h=eb39737402a3033a02b8d2254335b88b5ca99cef;hb=58a2b493f8df1072a1faa653c8abb6a3f9ba21fa;hp=cbb751c1481a5930872598def9ed88dea9a08305;hpb=ac866efb762875550bdc0c05d693e5eb026f435e;p=nepi.git

diff --git a/src/nepi/resources/linux/ccn/ccnd.py b/src/nepi/resources/linux/ccn/ccnd.py
index cbb751c1..eb397374 100644
--- a/src/nepi/resources/linux/ccn/ccnd.py
+++ b/src/nepi/resources/linux/ccn/ccnd.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
@@ -32,7 +31,7 @@ import os
 
 @clsinit_copy
 class LinuxCCND(LinuxApplication):
-    _rtype = "LinuxCCND"
+    _rtype = "linux::CCND"
 
     @classmethod
     def _register_attributes(cls):
@@ -205,7 +204,7 @@ class LinuxCCND(LinuxApplication):
         else:
             msg = " Failed to execute command '%s'" % command
             self.error(msg, out, err)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
     def do_stop(self):
         command = self.get('command') or ''
@@ -341,8 +340,8 @@ class LinuxCCND(LinuxApplication):
             })
 
         env = self.path 
-        env += " ".join(map(lambda k: "%s=%s" % (envs.get(k), str(self.get(k))) \
-            if self.get(k) else "", envs.keys()))
+        env += " ".join(["%s=%s" % (envs.get(k), str(self.get(k))) \
+            if self.get(k) else "" for k in list(envs.keys())])
         
         return env