snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Doh

Browse source
This commit is contained in:
Eelco Dolstra 2017-12-25 15:02:17 +01:00
parent 0d79f16fd5
commit 8913c682cf
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lib/Hydra/Plugin/SubversionInput.pm
View file

@ -65,8 +65,8 @@ sub fetchInput {
# Hm, if the Nix Perl bindings supported filters in # Hm, if the Nix Perl bindings supported filters in
# addToStore(), then we wouldn't need to make a copy here. # addToStore(), then we wouldn't need to make a copy here.
my $tmpDir = File::Temp->newdir("hydra-svn-export.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die; my $tmpDir = File::Temp->newdir("hydra-svn-export.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die;
(system "svn", "export", $wcPath, "$tmpDir/svn-export", "--quiet") == 0 or die "svn export failed"; (system "svn", "export", $wcPath, "$tmpDir/source", "--quiet") == 0 or die "svn export failed";
$storePath = addToStore("$tmpDir/svn-export", 1, "sha256"); $storePath = addToStore("$tmpDir/source", 1, "sha256");
} }
$sha256 = queryPathHash($storePath); $sha256 =~ s/sha256://; $sha256 = queryPathHash($storePath); $sha256 =~ s/sha256://;

6
src/root/reproduce.tt
View file

@ -99,7 +99,7 @@ inputDir=
[%+ IF input.type == "git" %] [%+ IF input.type == "git" %]
inputDir="$tmpDir/[% input.name %]/git-export" inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then if ! [ -d "$inputDir" ]; then
info "fetching Git input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..." info "fetching Git input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."
@ -121,7 +121,7 @@ args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revisio
[%+ ELSIF input.type == "hg" %] [%+ ELSIF input.type == "hg" %]
inputDir="$tmpDir/[% input.name %]/hg-archive" inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then if ! [ -d "$inputDir" ]; then
info "fetching Mercurial input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..." info "fetching Mercurial input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."
@ -143,7 +143,7 @@ args+=(--arg '[% input.name %]' "{ outPath = $inputDir; rev = \"[% input.revisio
[%+ ELSIF input.type == "svn" %] [%+ ELSIF input.type == "svn" %]
inputDir="$tmpDir/[% input.name %]/svn-export" inputDir="$tmpDir/[% input.name %]/source"
if ! [ -d "$inputDir" ]; then if ! [ -d "$inputDir" ]; then
info "fetching Subversion input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..." info "fetching Subversion input ‘[% input.name %]’ from ‘[% input.uri %]’ (commit [% input.revision %])..."

2
src/script/nix-prefetch-git
View file

@ -240,7 +240,7 @@ else
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT trap "rm -rf \"$tmpPath\"" EXIT
tmpFile="$tmpPath/git-export" tmpFile="$tmpPath/source"
mkdir "$tmpFile" mkdir "$tmpFile"
# Perform the checkout. # Perform the checkout.

2
src/script/nix-prefetch-hg
View file

@ -38,7 +38,7 @@ if test -z "$finalPath"; then
tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")" tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
trap "rm -rf \"$tmpPath\"" EXIT trap "rm -rf \"$tmpPath\"" EXIT
tmpArchive="$tmpPath/hg-archive" tmpArchive="$tmpPath/source"
# Perform the checkout. # Perform the checkout.
if [[ $url != /* ]]; then if [[ $url != /* ]]; then