maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Follow redirects early to ensure consistency between the manifest and the tarball

Browse source 
Without this change, if the URL is a redirect that changes in between,
we can get a manifest that doesn't match the tarball.
This commit is contained in:
Eelco Dolstra 2012-04-14 21:04:22 +02:00
parent ca3d9f8b31
commit 1d0bafb74d
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/nix-channel.in
View file

@ -89,6 +89,14 @@ sub update {
foreach my $name (keys %channels) { foreach my $name (keys %channels) {
my $url = $channels{$name}; my $url = $channels{$name};
# Check if $url is a redirect. If so, follow it now to ensure
# consistency if the redirection is changed between
# downloading the manifest and the tarball.
my $headers = `$Nix::Config::curl --silent --head '$url'`;
die "$0: unable to check `$url'\n" if $? != 0;
$headers =~ s/\r//g;
$url = $1 if $headers =~ /^Location:\s*(.*)\s*$/m;
# Pull the channel manifest. # Pull the channel manifest.
system("$Nix::Config::binDir/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0 system("$Nix::Config::binDir/nix-pull", "--skip-wrong-store", "$url/MANIFEST") == 0
or die "cannot pull manifest from `$url'\n"; or die "cannot pull manifest from `$url'\n";