From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Wed, 5 Mar 2014 17:23:11 +0000 (+0100)
Subject: Fixing uploading string stdin in LinuxApplication
X-Git-Tag: nepi-3.1.0~110
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=33657dec2e34e7d7dcb4da781de8a8dd6adbbae4;p=nepi.git

Fixing uploading string stdin in LinuxApplication
---

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