[ARVADOS] updated: ac1c1f563b53d22629e36e7d67de028abe55f1df

git at public.curoverse.com git at public.curoverse.com
Mon Sep 7 13:58:32 EDT 2015


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

       via  ac1c1f563b53d22629e36e7d67de028abe55f1df (commit)
       via  b7355341718c6d177b809bedbadc5a4fc4652de6 (commit)
       via  bef5ead515cbb990a461cad98dc01d631fcb3c36 (commit)
      from  0969c534741180e61ac318ffe799ac3512fc19d8 (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 ac1c1f563b53d22629e36e7d67de028abe55f1df
Merge: 0969c53 b735534
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Sep 7 13:56:48 2015 -0400

    Merge branch 'wtsi-hgi-fix/7205-arv-edit-tty-check'
    
    refs #7205


commit b7355341718c6d177b809bedbadc5a4fc4652de6
Author: Joshua Randall <joshua.randall at sanger.ac.uk>
Date:   Fri Sep 4 02:33:20 2015 +0100

    Moves printing of `arv edit` messages out-of-band
    
    Messages regarding update of object after edit are now
    printed out-of-band to STDERR rather than to STDOUT
    where they might mix with non-interactive "editors"

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index cbba121..b757855 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -309,9 +309,9 @@ def arv_edit client, arvados, global_opts, remaining_opts
                        authorization: 'OAuth2 '+ENV['ARVADOS_API_TOKEN']
                      })
       results = check_response result
-      puts "Updated object #{results['uuid']}"
+      STDERR.puts "Updated object #{results['uuid']}"
     else
-      puts "Object is unchanged, did not update."
+      STDERR.puts "Object is unchanged, did not update."
     end
   end
 

commit bef5ead515cbb990a461cad98dc01d631fcb3c36
Author: Joshua Randall <joshua.randall at sanger.ac.uk>
Date:   Fri Sep 4 02:31:38 2015 +0100

    Removes unnecessary check that stdout is a TTY

diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv
index 36ec037..cbba121 100755
--- a/sdk/cli/bin/arv
+++ b/sdk/cli/bin/arv
@@ -258,11 +258,6 @@ def arv_edit client, arvados, global_opts, remaining_opts
     exit 255
   end
 
-  if not $stdout.tty?
-    puts "Not connected to a TTY, cannot run interactive editor."
-    exit 1
-  end
-
   # determine controller
 
   m = /([a-z0-9]{5})-([a-z0-9]{5})-([a-z0-9]{15})/.match uuid

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list