X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Fccnr.py;h=53e4ccd577a5a2b530867a55d6219508dd9717f5;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=50421da972f1d34070b339da45b07e34f194eb58;hpb=ac866efb762875550bdc0c05d693e5eb026f435e;p=nepi.git diff --git a/src/nepi/resources/linux/ccn/ccnr.py b/src/nepi/resources/linux/ccn/ccnr.py index 50421da9..53e4ccd5 100644 --- a/src/nepi/resources/linux/ccn/ccnr.py +++ b/src/nepi/resources/linux/ccn/ccnr.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 @@ -29,7 +28,7 @@ import os @clsinit_copy class LinuxCCNR(LinuxApplication): - _rtype = "LinuxCCNR" + _rtype = "linux::CCNR" @classmethod def _register_attributes(cls): @@ -258,7 +257,7 @@ class LinuxCCNR(LinuxApplication): else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) @property def _start_command(self):