[ARVADOS] updated: 4dc656ce3e979ca6cf3e7900c9c96c21a63b761c

git at public.curoverse.com git at public.curoverse.com
Tue Sep 16 22:47:49 EDT 2014


Summary of changes:
 sdk/python/arvados/commands/run.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

       via  4dc656ce3e979ca6cf3e7900c9c96c21a63b761c (commit)
      from  77c077a48513ebcb1f17ba7e57cf6804b2af910f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 4dc656ce3e979ca6cf3e7900c9c96c21a63b761c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Sep 16 22:47:44 2014 -0400

    3609: Fix trimming redirect parts of the command line.

diff --git a/sdk/python/arvados/commands/run.py b/sdk/python/arvados/commands/run.py
index 3778c57..967a291 100644
--- a/sdk/python/arvados/commands/run.py
+++ b/sdk/python/arvados/commands/run.py
@@ -95,7 +95,7 @@ def main(arguments=None):
 
     commandargs = [("%s$(file %s/%s)" % (c.prefix, pdh, c.fn)) if isinstance(c, ArvFile) else c for c in commandargs]
 
-    cut = -1
+    cut = None
     i = -1
     stdio = [None, None]
     for j in xrange(0, len(commandargs)):
@@ -103,15 +103,16 @@ def main(arguments=None):
         if c == '<':
             stdio[0] = []
             i = 0
-            cut = j if cut == -1 else cut
+            cut = j if cut is None else cut
         elif c == '>':
             stdio[1] = []
             i = 1
-            cut = j if cut == -1 else cut
+            cut = j if cut is None else cut
         elif i > -1:
             stdio[i].append(c)
 
-    commandargs = commandargs[:cut]
+    if cut is not None:
+        commandargs = commandargs[:cut]
 
     component = {
         "script": "run-command",

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list