X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fccn%2Ffibentry.py;h=8712708145bc1e7fef45a330748d712a7c6908db;hb=6285ca51026efb69642eea9dfc7c480e722d84a9;hp=9809547409b0e14c6a314e34928b4caf6522674f;hpb=741b99fe027fe6b54846a0703d26510d9b40a135;p=nepi.git diff --git a/src/nepi/resources/linux/ccn/fibentry.py b/src/nepi/resources/linux/ccn/fibentry.py index 98095474..87127081 100644 --- a/src/nepi/resources/linux/ccn/fibentry.py +++ b/src/nepi/resources/linux/ccn/fibentry.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 @@ -182,7 +181,7 @@ class LinuxFIBEntry(LinuxApplication): if proc.poll(): msg = "Failed to execute command" self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) def configure(self): if self.trace_enabled("ping") and not self.ping: @@ -217,7 +216,7 @@ class LinuxFIBEntry(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') @@ -235,7 +234,7 @@ class LinuxFIBEntry(LinuxApplication): if err: msg = " Failed to execute command '%s'" % command self.error(msg, out, err) - raise RuntimeError, msg + raise RuntimeError(msg) @property def _start_command(self):