X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Ftraceroute.py;h=b9cdf991d5bbf2fcad5c3429c0c62579625b8988;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=d5ca818ad6d74759b5d1a3cedf62749e244dc5c8;hpb=d65870034ee507548249831729459ab5edf6da40;p=nepi.git diff --git a/src/nepi/resources/linux/traceroute.py b/src/nepi/resources/linux/traceroute.py index d5ca818a..b9cdf991 100644 --- a/src/nepi/resources/linux/traceroute.py +++ b/src/nepi/resources/linux/traceroute.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 @@ -27,7 +26,7 @@ import socket @clsinit_copy class LinuxTraceroute(LinuxApplication): - _rtype = "LinuxTraceroute" + _rtype = "linux::Traceroute" @classmethod def _register_attributes(cls): @@ -96,7 +95,7 @@ class LinuxTraceroute(LinuxApplication): else: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) else: super(LinuxTraceroute, self).do_start()