4303: crunch-job logs when it retries API calls.

[arvados.git] / sdk / cli / bin / arv-tag

diff --git a/sdk/cli/bin/arv-tag b/sdk/cli/bin/arv-tag
index ca12cb15abeaf8c3c5a172b61796d5e9792c8ffa..4ee6770f778587f8780eb49a230484496d496f8d 100755 (executable)
--- a/sdk/cli/bin/arv-tag
+++ b/sdk/cli/bin/arv-tag
@@ -16,7 +16,7 @@ def api_call(method, parameters:{}, request_body:{})
   request_body[:api_token] = ENV['ARVADOS_API_TOKEN']
   result = $client.execute(:api_method => method,
                            :parameters => parameters,
-                           :body => request_body,
+                           :body_object => request_body,
                            :authenticated => false)
 
   begin
@@ -81,11 +81,7 @@ def tag_remove(tag, obj_uuids=nil)
     $stderr.puts "no tags found to remove"
   end
 
-  return {
-    'kind' => 'arvados#linkList',
-    'items_available' => results.length,
-    'items' => results,
-  }
+  return results
 end
 
 if RUBY_VERSION < '1.9.3' then
@@ -161,7 +157,7 @@ global_opts = Trollop::options do
   opt :yaml, "Return the response received from the API server, in YAML format", :short => "-y"
   stop_on ['add', 'remove']
 end
-  
+
 p = Trollop::Parser.new do
   opt(:all,
       "Remove this tag from all objects under your ownership. Only valid with `tag remove'.",
@@ -191,6 +187,11 @@ $arvados = $client.discovered_api('arvados', $arvados_api_version)
 
 results = []
 cmd = ARGV.shift
+
+if ARGV.empty?
+  usage
+end
+
 case cmd
 when 'add'
   ARGV.each do |tag|
@@ -201,9 +202,9 @@ when 'add'
 when 'remove'
   ARGV.each do |tag|
     if $options[:all] then
-      results.push(tag_remove(tag))
+      results.concat tag_remove(tag)
     else
-      results.push(tag_remove(tag, $options[:object]))
+      results.concat tag_remove(tag, $options[:object])
     end
   end
 else
@@ -218,10 +219,7 @@ elsif global_opts[:json] then
   puts Oj.dump(results)
 else
   results.each do |r|
-    next if r == nil
-    if r["items"] and r["kind"].match /list$/i
-      r['items'].each do |i| puts i['uuid'] end
-    elsif r['uuid'].nil?
+    if r['uuid'].nil?
       abort("Response did not include a uuid:\n" +
             Oj.dump(r, :indent => 1) +
             "\n")