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
LinuxApplication: Changed directory structure to store experiment files in the Linux...
[nepi.git]
/
src
/
nepi
/
resources
/
linux
/
ccn
/
ccnapplication.py
diff --git
a/src/nepi/resources/linux/ccn/ccnapplication.py
b/src/nepi/resources/linux/ccn/ccnapplication.py
index
e5ae00e
..
39ac2a9
100644
(file)
--- a/
src/nepi/resources/linux/ccn/ccnapplication.py
+++ b/
src/nepi/resources/linux/ccn/ccnapplication.py
@@
-51,7
+51,7
@@
class LinuxCCNApplication(LinuxApplication):
@property
def _environment(self):
@property
def _environment(self):
- env = "PATH=$PATH:${
EXP_HOM
E}/ccnx/bin "
+ env = "PATH=$PATH:${
STOR
E}/ccnx/bin "
return env
def execute_command(self, command, env):
return env
def execute_command(self, command, env):
@@
-59,12
+59,7
@@
class LinuxCCNApplication(LinuxApplication):
command = environ + command
command = self.replace_paths(command)
command = environ + command
command = self.replace_paths(command)
- (out, err), proc = self.node.execute(command)
-
- if proc.poll():
- self._state = ResourceState.FAILED
- self.error(msg, out, err)
- raise RuntimeError, msg
+ return self.node.execute(command)
def valid_connection(self, guid):
# TODO: Validate!
def valid_connection(self, guid):
# TODO: Validate!