Fixing uploading string stdin in LinuxApplication
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 5 Mar 2014 17:23:11 +0000 (18:23 +0100)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 5 Mar 2014 17:23:11 +0000 (18:23 +0100)
src/nepi/execution/ec.py
src/nepi/resources/linux/application.py

index 21caac0..1be5c3c 100644 (file)
@@ -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
index 302e9fd..5adf1dc 100644 (file)
@@ -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