X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fping.py;h=f585b2e3f14cea395b89d3e68190343e61389497;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=68098cd86f365e8147c91653da55eadd387beaac;hpb=729014298a875a3520a163086c146070de5d5325;p=nepi.git diff --git a/src/nepi/resources/linux/ping.py b/src/nepi/resources/linux/ping.py index 68098cd8..f585b2e3 100644 --- a/src/nepi/resources/linux/ping.py +++ b/src/nepi/resources/linux/ping.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 @@ -26,7 +25,7 @@ import os @clsinit_copy class LinuxPing(LinuxApplication): - _rtype = "LinuxPing" + _rtype = "linux::Ping" @classmethod def _register_attributes(cls): @@ -213,7 +212,7 @@ class LinuxPing(LinuxApplication): else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) else: super(LinuxPing, self).do_start()