buildEnv: don't warn about collisions in propagated packages
This mimicks buildenv in Nix more closely.
This commit is contained in:
parent
403e594207
commit
03f9026ac5
|
@ -66,7 +66,7 @@ sub findFiles {
|
||||||
|
|
||||||
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
|
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
|
||||||
if ($ignoreCollisions) {
|
if ($ignoreCollisions) {
|
||||||
warn "collision between `$target' and `$oldTarget'";
|
warn "collision between `$target' and `$oldTarget'" if $ignoreCollisions == 1;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
die "collision between `$target' and `$oldTarget'";
|
die "collision between `$target' and `$oldTarget'";
|
||||||
|
@ -122,7 +122,7 @@ while (scalar(keys %postponed) > 0) {
|
||||||
my @pkgDirs = keys %postponed;
|
my @pkgDirs = keys %postponed;
|
||||||
%postponed = ();
|
%postponed = ();
|
||||||
foreach my $pkgDir (sort @pkgDirs) {
|
foreach my $pkgDir (sort @pkgDirs) {
|
||||||
addPkg($pkgDir, 1);
|
addPkg($pkgDir, 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue