[ARVADOS] updated: dd7bb176c565d0d0718f9b0e59a6d9ee4b8ecbf2

git at public.curoverse.com git at public.curoverse.com
Tue Oct 7 12:07:28 EDT 2014


Summary of changes:
 sdk/cli/bin/crunch-job | 49 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 33 insertions(+), 16 deletions(-)

       via  dd7bb176c565d0d0718f9b0e59a6d9ee4b8ecbf2 (commit)
       via  7a4f566c1a63ee37a88df16e25ca04e9a562fb1c (commit)
       via  b4c27edb438b8aec5f055b636afb476c6ea8284c (commit)
       via  2453adf513632740bc8a29f4d8b52789f4d8cd62 (commit)
       via  999cf322e35dfe147f7bab3204bf7c5b71e2e704 (commit)
      from  344c6dcdbae76310879c85a736e4e6cce05d5645 (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 dd7bb176c565d0d0718f9b0e59a6d9ee4b8ecbf2
Merge: 344c6dc 7a4f566
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Oct 7 12:04:34 2014 -0400

    Merge branch '3775-fetch-git-repo' closes #3775
    
    Conflicts:
    	sdk/cli/bin/crunch-job

diff --cc sdk/cli/bin/crunch-job
index 2cfd2dc,979a254..369bc3e
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@@ -413,14 -421,14 +426,15 @@@ else 
    } else {
      # $repo is none of the above. It must be the name of a hosted
      # repository.
 -    my $arv_repo_list = $arv->{'repositories'}->{'list'}->execute(
 -      'filters' => [['name','=',$repo]]
 -        );
 +    my $arv_repo_list = retry_op(sub {
 +      $arv->{'repositories'}->{'list'}->execute(
-         'filters' => [['name','=',$repo]])->{'items'};
++        'filters' => [['name','=',$repo]]);
 +    });
-     my $n_found = scalar @{$arv_repo_list};
+     my @repos_found = @{$arv_repo_list->{'items'}};
+     my $n_found = $arv_repo_list->{'serverResponse'}->{'items_available'};
      if ($n_found > 0) {
        Log(undef, "Repository '$repo' -> "
-           . join(", ", map { $_->{'uuid'} } @{$arv_repo_list}));
+           . join(", ", map { $_->{'uuid'} } @repos_found));
      }
      if ($n_found != 1) {
        croak("Error: Found $n_found repositories with name '$repo'.");

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list