From 33657dec2e34e7d7dcb4da781de8a8dd6adbbae4 Mon Sep 17 00:00:00 2001 From: Alina Quereilhac Date: Wed, 5 Mar 2014 18:23:11 +0100 Subject: [PATCH] Fixing uploading string stdin in LinuxApplication --- src/nepi/execution/ec.py | 2 +- src/nepi/resources/linux/application.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/nepi/execution/ec.py b/src/nepi/execution/ec.py index 21caac0e..1be5c3cf 100644 --- a/src/nepi/execution/ec.py +++ b/src/nepi/execution/ec.py @@ -607,7 +607,7 @@ class ExperimentController(object): """ rm = self.get_resource(guid) - return rm.set(name, value) + rm.set(name, value) def state(self, guid, hr = False): """ Returns the state of a resource diff --git a/src/nepi/resources/linux/application.py b/src/nepi/resources/linux/application.py index 302e9fd9..5adf1dc3 100644 --- a/src/nepi/resources/linux/application.py +++ b/src/nepi/resources/linux/application.py @@ -454,8 +454,12 @@ class LinuxApplication(ResourceManager): self.info("Uploading stdin") # upload stdin file to ${SHARE_DIR} directory - basename = os.path.basename(stdin) - dst = os.path.join(self.node.share_dir, basename) + if os.path.isfile(stdin): + basename = os.path.basename(stdin) + dst = os.path.join(self.node.share_dir, basename) + else: + dst = os.path.join(self.app_home, "stdin") + self.node.upload(stdin, dst, overwrite = False, text = True) # create "stdin" symlink on ${APP_HOME} directory -- 2.43.0