lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Merge pull request #571 from kquick/moreinfo

Browse source 
Additional helpful information in error messages.
This commit is contained in:
Graham Christensen 2019-03-18 15:18:14 -05:00 committed by GitHub
parent 215ca5da9c 2e225ba7c8
commit 8a41ea5f60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Helper/AddBuilds.pm
View file

@ -56,7 +56,7 @@ sub updateDeclarativeJobset {
$input->jobsetinputalts->create({altnr => 0, value => $data->{value}}); $input->jobsetinputalts->create({altnr => 0, value => $data->{value}});
} }
delete $declSpec->{"inputs"}; delete $declSpec->{"inputs"};
die "invalid keys in declarative specification file\n" if (%{$declSpec}); die "invalid keys ($declSpec) in declarative specification file\n" if (%{$declSpec});
}); });
}; };

8
src/lib/Hydra/Helper/Nix.pm
View file

@ -425,7 +425,13 @@ sub run {
sub grab { sub grab {
my (%args) = @_; my (%args) = @_;
my $res = run(%args, grabStderr => 0); my $res = run(%args, grabStderr => 0);
die "command `@{$args{cmd}}' failed with exit status $res->{status}" if $res->{status}; if ($res->{status}) {
my $msgloc = "(in an indeterminate location)";
if (defined $args{dir}) {
$msgloc = "in $args{dir}";
}
die "command `@{$args{cmd}}' failed with exit status $res->{status} $msgloc";
}
return $res->{stdout}; return $res->{stdout};
} }