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 tickets http://newyans.pl.sophia.inria.fr/trac/ticket/37 and http://newyans...
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
application.py
diff --git
a/src/nepi/resources/linux/application.py
b/src/nepi/resources/linux/application.py
index
92e4960
..
c1de543
100644
(file)
--- a/
src/nepi/resources/linux/application.py
+++ b/
src/nepi/resources/linux/application.py
@@
-492,7
+492,7
@@
class LinuxApplication(ResourceManager):
if not command:
# If no command was given (i.e. Application was used for dependency
# installation), then the application is directly marked as FINISHED
if not command:
# If no command was given (i.e. Application was used for dependency
# installation), then the application is directly marked as FINISHED
- super(LinuxApplication, self).do_finish
ed
()
+ super(LinuxApplication, self).do_finish()
else:
if self.in_foreground:
self._run_in_foreground()
else:
if self.in_foreground:
self._run_in_foreground()
@@
-633,10
+633,10
@@
class LinuxApplication(ResourceManager):
msg = " Failed to execute command '%s'" % self.get("command")
err = self._proc.stderr.read()
self.error(msg, out, err)
msg = " Failed to execute command '%s'" % self.get("command")
err = self._proc.stderr.read()
self.error(msg, out, err)
- self.fail()
+ self.
do_
fail()
elif retcode == 0:
elif retcode == 0:
- self.finish()
+ self.
do_
finish()
else:
# We need to query the status of the command we launched in
# background. In order to avoid overwhelming the remote host and
else:
# We need to query the status of the command we launched in
# background. In order to avoid overwhelming the remote host and
@@
-658,9
+658,9
@@
class LinuxApplication(ResourceManager):
msg = "Failed to execute command '%s'" % \
self.get("command")
self.error(msg, out, err)
msg = "Failed to execute command '%s'" % \
self.get("command")
self.error(msg, out, err)
- self.fail()
+ self.
do_
fail()
else:
else:
- self.finish()
+ self.
do_
finish()
self._last_state_check = tnow()
self._last_state_check = tnow()