wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 10:11:47 +02:00
Code Activity

* Don't barf on lines in nix-pull manifests that we don't recognise.

Browse source 
Necessary for compatibility with 0.7 patch deployment.
* Bumped version number to 0.6.1.
This commit is contained in:
Eelco Dolstra 2004-12-21 13:05:25 +00:00
parent 2bd9f0d76b
commit 0d157eed99
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,4 +1,4 @@
AC_INIT(nix, "0.6") AC_INIT(nix, "0.6.1")
AC_CONFIG_SRCDIR(README) AC_CONFIG_SRCDIR(README)
AC_CONFIG_AUX_DIR(config) AC_CONFIG_AUX_DIR(config)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE

11
scripts/readmanifest.pm.in
View file

@ -17,6 +17,7 @@ sub processURL {
open MANIFEST, "<$manifest"; open MANIFEST, "<$manifest";
my $inside = 0; my $inside = 0;
my $type;
my $storePath; my $storePath;
my $narurl; my $narurl;
@ -29,24 +30,28 @@ sub processURL {
next if (/^$/); next if (/^$/);
if (!$inside) { if (!$inside) {
if (/^\{$/) { if (/^\s*(\w*)\s*\{$/) {
$inside = 1; $inside = 1;
$type = $1;
$type = "narfile" if $type eq "";
undef $storePath; undef $storePath;
undef $narurl; undef $narurl;
undef $hash; undef $hash;
@preds = (); @preds = ();
} }
else { die "bad line: $_"; }
} else { } else {
if (/^\}$/) { if (/^\}$/) {
$inside = 0; $inside = 0;
if ($type eq "narfile") {
$$storePaths2urls{$storePath} = $narurl; $$storePaths2urls{$storePath} = $narurl;
$$urls2hashes{$narurl} = $hash; $$urls2hashes{$narurl} = $hash;
foreach my $p (@preds) { foreach my $p (@preds) {
$$successors{$p} = $storePath; $$successors{$p} = $storePath;
} }
}
} }
elsif (/^\s*StorePath:\s*(\/\S+)\s*$/) { elsif (/^\s*StorePath:\s*(\/\S+)\s*$/) {
@ -61,7 +66,7 @@ sub processURL {
elsif (/^\s*SuccOf:\s*(\/\S+)\s*$/) { elsif (/^\s*SuccOf:\s*(\/\S+)\s*$/) {
push @preds, $1; push @preds, $1;
} }
else { die "bad line: $_"; }
} }
} }