colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildEnv: don't warn about collisions in propagated packages

Browse Source 
This mimicks buildenv in Nix more closely.
This commit is contained in:
Eelco Dolstra 2012-07-25 16:24:18 -04:00
parent 403e594207
commit 03f9026ac5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/buildenv/builder.pl
View File

@ -66,7 +66,7 @@ sub findFiles {
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
if ($ignoreCollisions) {
warn "collision between `$target' and `$oldTarget'";
warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
return;
} else {
die "collision between `$target' and `$oldTarget'";
@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) {
my @pkgDirs = keys %postponed;
%postponed = ();
foreach my $pkgDir (sort @pkgDirs) {
addPkg($pkgDir, 1);
addPkg($pkgDir, 2);
}
}