Author: eelco
Date: Mon Nov 29 09:26:05 2010
New Revision: 24910
URL: https://svn.nixos.org/websvn/nix/?rev=24910&sc=1
Log:
* Don't generate patches if the system type differs.
Modified:
nix/branches/sqlite/scripts/generate-patches.pl.in
nix/branches/sqlite/scripts/readmanifest.pm.in
Modified: nix/branches/sqlite/scripts/generate-patches.pl.in
==============================================================================
--- nix/branches/sqlite/scripts/generate-patches.pl.in Mon Nov 29 09:15:45
2010 (r24909)
+++ nix/branches/sqlite/scripts/generate-patches.pl.in Mon Nov 29 09:26:05
2010 (r24910)
@@ -228,6 +228,13 @@
if ($name eq $name2) {
+ my $srcSystem = @{$dstNarFiles{$p}}[0]->{system};
+ my $dstSystem = @{$srcNarFiles{$q}}[0]->{system};
+ if (defined $srcSystem && defined $dstSystem && $srcSystem ne
$dstSystem) {
+ print " SKIPPING $q due to different systems ($srcSystem vs.
$dstSystem)\n";
+ next;
+ }
+
# If the sizes differ too much, then skip. This
# disambiguates between, e.g., a real component and a
# wrapper component (cf. Firefox in Nixpkgs).
@@ -238,7 +245,7 @@
# print " SIZE $srcSize $dstSize $ratio $q\n";
if ($ratio >= 3) {
- print " SKIPPING $q due to size ratio $ratio ($srcSize
$dstSize)\n";
+ print " SKIPPING $q due to size ratio $ratio ($srcSize vs.
$dstSize)\n";
next;
}
Modified: nix/branches/sqlite/scripts/readmanifest.pm.in
==============================================================================
--- nix/branches/sqlite/scripts/readmanifest.pm.in Mon Nov 29 09:15:45
2010 (r24909)
+++ nix/branches/sqlite/scripts/readmanifest.pm.in Mon Nov 29 09:26:05
2010 (r24910)
@@ -34,7 +34,7 @@
my $manifestVersion = 2;
my ($storePath, $url, $hash, $size, $basePath, $baseHash, $patchType);
- my ($narHash, $narSize, $references, $deriver, $hashAlgo, $copyFrom);
+ my ($narHash, $narSize, $references, $deriver, $hashAlgo, $copyFrom,
$system);
while (<MANIFEST>) {
chomp;
@@ -56,6 +56,7 @@
undef $basePath;
undef $baseHash;
undef $patchType;
+ undef $system;
$references = "";
$deriver = "";
$hashAlgo = "md5";
@@ -83,6 +84,7 @@
, narHash => $narHash, narSize => $narSize
, references => $references
, deriver => $deriver, hashAlgo => $hashAlgo
+ , system => $system
};
}
@@ -128,6 +130,7 @@
elsif (/^\s*References:\s*(.*)\s*$/) { $references = $1; }
elsif (/^\s*Deriver:\s*(\S+)\s*$/) { $deriver = $1; }
elsif (/^\s*ManifestVersion:\s*(\d+)\s*$/) { $manifestVersion =
$1; }
+ elsif (/^\s*System:\s*(\S+)\s*$/) { $system = $1; }
# Compatibility;
elsif (/^\s*NarURL:\s*(\S+)\s*$/) { $url = $1; }
@@ -165,6 +168,7 @@
if defined $narFile->{references} && $narFile->{references} ne
"";
print MANIFEST " Deriver: $narFile->{deriver}\n"
if defined $narFile->{deriver} && $narFile->{deriver} ne "";
+ print MANIFEST " System: $narFile->{system}\n" if defined
$narFile->{system};
print MANIFEST "}\n";
}
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
