arvados-cli 0.1.20140909115812 → 0.1.20140909151622
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/crunch-job +11 -11
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c9615585720664982aa7d76d12874384c6905198
|
4
|
+
data.tar.gz: 72d2dacdb50723c8b9dd01eeb907eb03533247b0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 21180f0df8bdeabb95ca2a17e9c17c45c15fdf3c55f5ac34074d98e4c9ec63371a3f9586540a2c4a88b10c7acb8b55269d2b188ea19a3fd2b339e6773e8b5036
|
7
|
+
data.tar.gz: b8b1d3578a084db315aabc4a5a4dbf10eb8561f5bf9dbefe3f3f79b6630c9a95eef39bca353b1c03343f874a879d82eb92bc2becc6f0e19615abc174b978e555
|
data/bin/crunch-job
CHANGED
@@ -447,9 +447,10 @@ else
|
|
447
447
|
if ($treeish =~ m{^\d{1,4}$}) {
|
448
448
|
my $gitlog = `git --git-dir=\Q$repo\E log --pretty="format:%H" --grep="git-svn-id:.*\@"\Q$treeish\E" " master`;
|
449
449
|
chomp $gitlog;
|
450
|
-
|
450
|
+
Log(undef, "git Subversion search exited $?");
|
451
|
+
if (($? == 0) && ($gitlog =~ /^[a-f0-9]{40}$/)) {
|
451
452
|
$commit = $gitlog;
|
452
|
-
Log
|
453
|
+
Log(undef, "Using commit $commit for Subversion revision $treeish");
|
453
454
|
}
|
454
455
|
}
|
455
456
|
|
@@ -458,21 +459,19 @@ else
|
|
458
459
|
if (!defined $commit) {
|
459
460
|
my $found = `git --git-dir=\Q$repo\E rev-list -1 ''\Q$treeish\E`;
|
460
461
|
chomp $found;
|
461
|
-
|
462
|
+
Log(undef, "git rev-list exited $? with result '$found'");
|
463
|
+
if (($? == 0) && ($found =~ /^[0-9a-f]{40}$/s)) {
|
462
464
|
$commit = $found;
|
465
|
+
Log(undef, "Using commit $commit for tree-ish $treeish");
|
463
466
|
if ($commit ne $treeish) {
|
464
467
|
# Make sure we record the real commit id in the database,
|
465
468
|
# frozentokey, logs, etc. -- instead of an abbreviation or a
|
466
469
|
# branch name which can become ambiguous or point to a
|
467
470
|
# different commit in the future.
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
!$job_has_uuid or
|
473
|
-
$Job->update_attributes('script_version' => $commit) or
|
474
|
-
croak("Error while updating job");
|
475
|
-
}
|
471
|
+
$Job->{'script_version'} = $commit;
|
472
|
+
!$job_has_uuid or
|
473
|
+
$Job->update_attributes('script_version' => $commit) or
|
474
|
+
croak("Error while updating job");
|
476
475
|
}
|
477
476
|
}
|
478
477
|
}
|
@@ -482,6 +481,7 @@ else
|
|
482
481
|
@execargs = ("sh", "-c",
|
483
482
|
"mkdir -p $ENV{CRUNCH_INSTALL} && cd $ENV{CRUNCH_TMP} && perl -");
|
484
483
|
$git_archive = `git --git-dir=\Q$repo\E archive ''\Q$commit\E`;
|
484
|
+
croak("git archive failed: exit " . ($? >> 8)) if ($? != 0);
|
485
485
|
}
|
486
486
|
else {
|
487
487
|
croak ("could not figure out commit id for $treeish");
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: arvados-cli
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.20140909151622
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Arvados Authors
|
@@ -166,7 +166,7 @@ dependencies:
|
|
166
166
|
- - "<"
|
167
167
|
- !ruby/object:Gem::Version
|
168
168
|
version: 1.0.0
|
169
|
-
description: This is the Arvados SDK CLI gem, git revision
|
169
|
+
description: This is the Arvados SDK CLI gem, git revision b0440160e64caecbff160a26f62301dd15d84c7f
|
170
170
|
email: gem-dev@curoverse.com
|
171
171
|
executables:
|
172
172
|
- arv
|