git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing RM.DEPLOY being executed after/during RM.RELEASE by adding a release_lock...
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
nping.py
diff --git
a/src/nepi/resources/linux/nping.py
b/src/nepi/resources/linux/nping.py
index
ec874bc
..
62bacd8
100644
(file)
--- a/
src/nepi/resources/linux/nping.py
+++ b/
src/nepi/resources/linux/nping.py
@@
-18,7
+18,7
@@
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
# Author: Alina Quereilhac <alina.quereilhac@inria.fr>
from nepi.execution.attribute import Attribute, Flags, Types
-from nepi.execution.resource import clsinit_copy
, failtrap
+from nepi.execution.resource import clsinit_copy
from nepi.resources.linux.application import LinuxApplication
from nepi.util.timefuncs import tnow
from nepi.resources.linux.application import LinuxApplication
from nepi.util.timefuncs import tnow
@@
-133,8
+133,7
@@
class LinuxNPing(LinuxApplication):
self._home = "nping-%s" % self.guid
self._sudo_kill = True
self._home = "nping-%s" % self.guid
self._sudo_kill = True
- @failtrap
- def deploy(self):
+ def do_deploy(self):
if not self.get("command"):
self.set("command", self._start_command)
if not self.get("command"):
self.set("command", self._start_command)
@@
-147,7
+146,7
@@
class LinuxNPing(LinuxApplication):
if not self.get("depends"):
self.set("depends", "nmap")
if not self.get("depends"):
self.set("depends", "nmap")
- super(LinuxNPing, self).deploy()
+ super(LinuxNPing, self).d
o_d
eploy()
@property
def _start_command(self):
@property
def _start_command(self):