Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/hydra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 215ca5da9ce9
Choose a base ref
...
head repository: NixOS/hydra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8a41ea5f6007
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 30, 2018

  1. Additional helpful information in error messages.

    @kquick
    kquick committed Jun 30, 2018
    Copy the full SHA
    e523e8a View commit details

Commits on Mar 18, 2019

  1. Do not attempt to report dir for grab command failure if not specified.

    @kquick
    kquick committed Mar 18, 2019
    Copy the full SHA
    2e225ba View commit details

  2. Merge pull request #571 from kquick/moreinfo 

    Additional helpful information in error messages.
    @grahamc
    grahamc authored Mar 18, 2019
    Copy the full SHA
    8a41ea5 View commit details
Showing with 8 additions and 2 deletions.
  1. +1 −1 src/lib/Hydra/Helper/AddBuilds.pm
  2. +7 −1 src/lib/Hydra/Helper/Nix.pm
2 changes: 1 addition & 1 deletion src/lib/Hydra/Helper/AddBuilds.pm
View file
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ sub updateDeclarativeJobset {
$input->jobsetinputalts->create({altnr => 0, value => $data->{value}});
}
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 changes: 7 additions & 1 deletion src/lib/Hydra/Helper/Nix.pm
View file
Original file line number Diff line number Diff line change
@@ -425,7 +425,13 @@ sub run {
sub grab {
my (%args) = @_;
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};
}