arvados-cli 0.1.20140807091031 → 0.1.20140807104453

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5200cc56998342a2cc719353914a4999949c3212
-  data.tar.gz: 464e8f1e7022630a2576103fa0e589c45ab0de21
+  metadata.gz: e5f65f6826fa5e12412a470529847109299b5741
+  data.tar.gz: 2b64b8247f2896bf8226df2c3326adaec1ed15e6
 SHA512:
-  metadata.gz: ae828cf1c51871193593216ce04111087a0a2280a55099fef76b16b5fd8c0325fd073fd1504300949348d2ffffb439c703b20d2a3699b97e5e7443f0e4b07167
-  data.tar.gz: a0d773fe39c9a0a0076436a814000dcb1c56693c80b7b3c570c12c1806bb285bb318b4b3f3ce02500f37c7e6471dfa868f6317a60db5df70e4ca5d69dcfa9b6e
+  metadata.gz: ecade87cc0ce01e93c1516a71b6e140bead5194e8b9eb1e1dc5ae458b96182320469272b9a83da1067a3e3df93ee4475134ab2590cd812e20131c33bad64a76c
+  data.tar.gz: f6898f925a1f1ec9be6c6c69dc715ede9763154bce049d3a14dba79b94e7e90d048e02d29e113ad7ee6b1d3c8b8d2679e3ecb907f8f05aa34e49911b12e2a94e

data/bin/crunch-job

@@ -834,8 +834,10 @@ if ($job_has_uuid) {
                           'finished_at' => scalar gmtime)
 }
 
-if ($collated_output)
-{
+if (!$collated_output) {
+  Log(undef, "output undef");
+}
+else {
   eval {
     open(my $orig_manifest, '-|', 'arv-get', $collated_output)
         or die "failed to get collated manifest: $!";
@@ -858,7 +860,8 @@ if ($collated_output)
       'uuid' => md5_hex($stripped_manifest_text),
       'manifest_text' => $orig_manifest_text,
     });
-    $Job->update_attributes('output' => $output->{uuid});
+    Log(undef, "output " . $output->{uuid});
+    $Job->update_attributes('output' => $output->{uuid}) if $job_has_uuid;
     if ($Job->{'output_is_persistent'}) {
       $arv->{'links'}->{'create'}->execute('link' => {
         'tail_kind' => 'arvados#user',
@@ -1244,15 +1247,6 @@ sub collate_output
   }
   waitpid($pid, 0);
 
-  if ($joboutput)
-  {
-    Log (undef, "output $joboutput");
-    $Job->update_attributes('output' => $joboutput) if $job_has_uuid;
-  }
-  else
-  {
-    Log (undef, "output undef");
-  }
   return $joboutput;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140807091031
+  version: 0.1.20140807104453
 platform: ruby
 authors:
 - Arvados Authors
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision 862a1fd23f072b7107595755996fc2ec1c62162b
+description: This is the Arvados SDK CLI gem, git revision 1d1069684c35353f9f0ee4020b76f5dfc7406a47
 email: gem-dev@curoverse.com
 executables:
 - arv