[ARVADOS] updated: 1.1.4-45-gc387fcf
Git user
git at public.curoverse.com
Wed Apr 18 16:25:16 EDT 2018
Summary of changes:
sdk/python/arvados/commands/keepdocker.py | 5 +++--
sdk/python/arvados/commands/put.py | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
via c387fcfee48b878caa19f09e0b0f07646b2036db (commit)
from 8e8376ad9a82f7d4d662f7dcbfa5ad23abf647d0 (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 c387fcfee48b878caa19f09e0b0f07646b2036db
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Wed Apr 18 16:23:29 2018 -0400
arv-put: restore_signal_handlers conditional on install_sig_handlers
arv-keepdocker: accept api object to use
refs #13108
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py
index 16fefdb..fe6beab 100644
--- a/sdk/python/arvados/commands/keepdocker.py
+++ b/sdk/python/arvados/commands/keepdocker.py
@@ -345,9 +345,10 @@ def _uuid2pdh(api, uuid):
select=['portable_data_hash'],
).execute()['items'][0]['portable_data_hash']
-def main(arguments=None, stdout=sys.stdout, install_sig_handlers=True):
+def main(arguments=None, stdout=sys.stdout, install_sig_handlers=True, api=None):
args = arg_parser.parse_args(arguments)
- api = arvados.api('v1')
+ if api is None:
+ api = arvados.api('v1')
if args.image is None or args.image == 'images':
fmt = "{:30} {:10} {:12} {:29} {:20}\n"
diff --git a/sdk/python/arvados/commands/put.py b/sdk/python/arvados/commands/put.py
index 6e7e023..388d87b 100644
--- a/sdk/python/arvados/commands/put.py
+++ b/sdk/python/arvados/commands/put.py
@@ -1176,7 +1176,8 @@ def main(arguments=None, stdout=sys.stdout, stderr=sys.stderr,
if not output.endswith('\n'):
stdout.write('\n')
- arv_cmd.restore_signal_handlers()
+ if install_sig_handlers:
+ arv_cmd.restore_signal_handlers()
if status != 0:
sys.exit(status)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list