the-distro/channel-scripts
1
0
Fork 1
Code Issues 8 Pull requests Packages Projects Releases Wiki Activity

mirror-branch: Always exit with 1 on nix-instantiate error

Browse source 
Resolving the values and being fancy is harder than the actual benefits
would give out.

Return all the info we have, and let the pager'd person deal with the
data.
This commit is contained in:
Samuel Dionne-Riel 2020-01-02 21:45:51 -05:00
parent 5146d2cb25
commit c4a61dfe8a
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mirror-nixos-branch.pl
View file

@ -75,14 +75,11 @@ print STDERR "release is ‘$releaseName’ (build $releaseId), eval is $evalId,
# Guard against the channel going back in time. # Guard against the channel going back in time.
my @curReleaseUrl = split(/\//, read_file("$channelsDir/$channelName", err_mode => 'quiet') // ""); my @curReleaseUrl = split(/\//, read_file("$channelsDir/$channelName", err_mode => 'quiet') // "");
my $curRelease = pop @curReleaseUrl; my $curRelease = pop @curReleaseUrl;
$! = 0; # Clear errno to avoid reporting non-fork/exec-related issues
my $d = `NIX_PATH= nix-instantiate --eval -E "builtins.compareVersions (builtins.parseDrvName \\"$curRelease\\").version (builtins.parseDrvName \\"$releaseName\\").version"`; my $d = `NIX_PATH= nix-instantiate --eval -E "builtins.compareVersions (builtins.parseDrvName \\"$curRelease\\").version (builtins.parseDrvName \\"$releaseName\\").version"`;
if ($? == -1) { if ($? != 0) {
warn("could not execute nix-instantiate ($!).\n"); warn "Could not execute nix-instantiate: exit $?; errno $!\n";
exit 127; exit 1;
}
if ($? > 0) {
warn("error while executing nix-instantiate ($?).\n");
exit $?;
} }
chomp $d; chomp $d;
if ($d == 1) { if ($d == 1) {