diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-29 09:26:05 +0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-11-29 09:26:05 +0000 |
commit | 9737a7eba0844e317591f16092879696c4f3feae (patch) | |
tree | 6feaaa6a5f97402f66fc0c99151bbb8e7dc30495 /scripts/generate-patches.pl.in | |
parent | bd48fd97f646f068ae2725b5b2f048d45866119b (diff) |
* Don't generate patches if the system type differs.
Diffstat (limited to 'scripts/generate-patches.pl.in')
-rwxr-xr-x | scripts/generate-patches.pl.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/generate-patches.pl.in b/scripts/generate-patches.pl.in index 3be30be00..05bf65093 100755 --- a/scripts/generate-patches.pl.in +++ b/scripts/generate-patches.pl.in @@ -228,6 +228,13 @@ foreach my $p (keys %dstOutPaths) { 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 @@ foreach my $p (keys %dstOutPaths) { # 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; } |