projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2352: when using arv-run-pipeline-instance, set state to RunningOnClient.
[arvados.git]
/
sdk
/
cli
/
bin
/
arv-tag
diff --git
a/sdk/cli/bin/arv-tag
b/sdk/cli/bin/arv-tag
index ca12cb15abeaf8c3c5a172b61796d5e9792c8ffa..9ce3f3d237bc36a47b796294b2f88cd7e3ca10b1 100755
(executable)
--- a/
sdk/cli/bin/arv-tag
+++ b/
sdk/cli/bin/arv-tag
@@
-81,11
+81,7
@@
def tag_remove(tag, obj_uuids=nil)
$stderr.puts "no tags found to remove"
end
$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
end
if RUBY_VERSION < '1.9.3' then
@@
-191,6
+187,11
@@
$arvados = $client.discovered_api('arvados', $arvados_api_version)
results = []
cmd = ARGV.shift
results = []
cmd = ARGV.shift
+
+if ARGV.empty?
+ usage
+end
+
case cmd
when 'add'
ARGV.each do |tag|
case cmd
when 'add'
ARGV.each do |tag|
@@
-201,9
+202,9
@@
when 'add'
when 'remove'
ARGV.each do |tag|
if $options[:all] then
when 'remove'
ARGV.each do |tag|
if $options[:all] then
- results.
push(tag_remove(tag)
)
+ results.
concat tag_remove(tag
)
else
else
- results.
push(tag_remove(tag, $options[:object])
)
+ results.
concat tag_remove(tag, $options[:object]
)
end
end
else
end
end
else
@@
-218,10
+219,7
@@
elsif global_opts[:json] then
puts Oj.dump(results)
else
results.each do |r|
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")
abort("Response did not include a uuid:\n" +
Oj.dump(r, :indent => 1) +
"\n")