[ARVADOS] updated: b653edb9423532b89f9f534033fc5587798b0743

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/arv | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  b653edb9423532b89f9f534033fc5587798b0743 (commit)
      from  d42b1376a1ed33ddeaa1c8269c7947dbd6596596 (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 b653edb9423532b89f9f534033fc5587798b0743
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jun 20 17:10:10 2014 -0400

    2986: Handles collection ids in 'arv edit' (tells the user collections are not
    editable.)  Added error message when subcommand or resource is
    unrecognized. Removed old reference to removed command line parameter
    global_opts[:resources].

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 4867512..cf3fffa 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -164,7 +164,11 @@ def arv_edit client, arvados, global_opts, remaining_opts
 
   m = /([a-z0-9]{5})-([a-z0-9]{5})-([a-z0-9]{15})/.match n
   if !m
-    abort puts "#{n} does not appear to be an Arvados uuid"
+    if /^[a-f0-9]{32}/.match n
+      abort "Arvados collections are not editable."
+    else
+      abort "#{n} does not appear to be an Arvados uuid"
+    end
   end
 
   rsc = nil
@@ -385,7 +389,8 @@ def parse_arguments(discovery_document, subcommands)
   resource = ARGV.shift
 
   if not subcommands.include? resource
-    if global_opts[:resources] or not resource_types.include?(resource)
+    if not resource_types.include?(resource)
+      puts "Resource or subcommand '#{resource}' is not recognized.\n\n"
       help_resources(option_parser, discovery_document, resource)
     end
 

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


hooks/post-receive
--