ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix the binary cache calling isValidPath, and 2 other files with the same issue

Browse Source
This commit is contained in:
Michael Bishop
2024-09-20 04:08:22 -03:00
parent 879ceb5cdc
commit cc1b6d394e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/Hydra/Controller/Root.pm
View File

@@ -329,7 +329,7 @@ sub nar :Local :Args(1) {
else { else {
$path = $Nix::Config::storeDir . "/$path"; $path = $Nix::Config::storeDir . "/$path";
gone($c, "Path " . $path . " is no longer available.") unless isValidPath($path); gone($c, "Path " . $path . " is no longer available.") unless $MACHINE_LOCAL_STORE->isValidPath($path);
$c->stash->{current_view} = 'NixNAR'; $c->stash->{current_view} = 'NixNAR';
$c->stash->{storePath} = $path; $c->stash->{storePath} = $path;

2
src/lib/Hydra/Plugin/S3Backup.pm
View File

@@ -92,7 +92,7 @@ sub buildFinished {
my $hash = substr basename($path), 0, 32; my $hash = substr basename($path), 0, 32;
my ($deriver, $narHash, $time, $narSize, $refs) = queryPathInfo($path, 0); my ($deriver, $narHash, $time, $narSize, $refs) = queryPathInfo($path, 0);
my $system; my $system;
if (defined $deriver and isValidPath($deriver)) { if (defined $deriver and $MACHINE_LOCAL_STORE->isValidPath($deriver)) {
$system = derivationFromPath($deriver)->{platform}; $system = derivationFromPath($deriver)->{platform};
} }
foreach my $reference (@{$refs}) { foreach my $reference (@{$refs}) {

2
src/lib/Hydra/Plugin/SubversionInput.pm
View File

@@ -46,7 +46,7 @@ sub fetchInput {
$MACHINE_LOCAL_STORE->addTempRoot($cachedInput->storepath) if defined $cachedInput; $MACHINE_LOCAL_STORE->addTempRoot($cachedInput->storepath) if defined $cachedInput;
if (defined $cachedInput && isValidPath($cachedInput->storepath)) { if (defined $cachedInput && $MACHINE_LOCAL_STORE->isValidPath($cachedInput->storepath)) {
$storePath = $cachedInput->storepath; $storePath = $cachedInput->storepath;
$sha256 = $cachedInput->sha256hash; $sha256 = $cachedInput->sha256hash;
} else { } else {