[ARVADOS] updated: 51de3bf2f50cae3fce8a6ffdb3528e96afe67245

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/commands/run.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

       via  51de3bf2f50cae3fce8a6ffdb3528e96afe67245 (commit)
      from  0812bc1c717e5fed57d420b177f6ca9d41e81032 (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 51de3bf2f50cae3fce8a6ffdb3528e96afe67245
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Oct 31 16:37:47 2014 -0400

    3609: Correctly recognize and rewrite directory names in collections.

diff --git a/sdk/python/arvados/commands/run.py b/sdk/python/arvados/commands/run.py
index 411b997..f2bf0f3 100644
--- a/sdk/python/arvados/commands/run.py
+++ b/sdk/python/arvados/commands/run.py
@@ -92,6 +92,12 @@ def statfile(prefix, fn):
             else:
                 # trim leading '/' for path prefix test later
                 return UploadFile(prefix, absfn[1:])
+        if stat.S_ISDIR(st.st_mode):
+            sp = os.path.split(absfn)
+            (pdh, branch) = is_in_collection(sp[0], sp[1])
+            if pdh:
+                return ArvFile(prefix, "$(dir %s/%s/)" % (pdh, branch))
+
     return prefix+fn
 
 def main(arguments=None):
@@ -208,7 +214,7 @@ def main(arguments=None):
         print("Upload local files: \"%s\"" % '" "'.join([c.fn for c in files]))
 
         if args.dry_run:
-            print("cd %s" % pathprefix)
+            print("$(input) is %s" % pathprefix.rstrip('/'))
             pdh = "$(input)"
         else:
             files = sorted(files, key=lambda x: x.fn)

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


hooks/post-receive
--