summary refs log tree commit diff
path: root/pkgs/build-support/buildenv/builder.pl
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-25 16:24:18 -0400
committerEelco Dolstra <eelco.dolstra@logicblox.com>2012-07-25 23:18:39 -0400
commit03f9026ac5ce7568c4b5c28d30552f869e229c63 (patch)
tree29d46d6aa5aab9bfd4bbeb13555b7e013a4e8c7c /pkgs/build-support/buildenv/builder.pl
parent403e59420710d8221a3d3ce47be1d15b4d9dcb3d (diff)
downloadnixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar.gz
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar.bz2
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar.lz
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar.xz
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.tar.zst
nixpkgs-03f9026ac5ce7568c4b5c28d30552f869e229c63.zip
buildEnv: don't warn about collisions in propagated packages
This mimicks buildenv in Nix more closely.
Diffstat (limited to 'pkgs/build-support/buildenv/builder.pl')
-rwxr-xr-xpkgs/build-support/buildenv/builder.pl4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 71502c9f668..08331b178f4 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -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);
     }
 }