diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-11-23 23:11:06 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-01-18 03:56:09 +0100 |
commit | bfb11fd0301c1c583319bd2e8211ef434e078792 (patch) | |
tree | 2836393746ded9844eb8c3004794d1dfeb70cca5 | |
parent | 4529ed12590d7f814e40223437c7df4fea492e2d (diff) | |
download | nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar.gz nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar.bz2 nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar.lz nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar.xz nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.tar.zst nixlib-bfb11fd0301c1c583319bd2e8211ef434e078792.zip |
buildEnv: Skip content check on ignoreCollisions.
Checking file contents is redundant in this case, because we will go ahead anyway, regardless of whether the content is the same. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rwxr-xr-x | pkgs/build-support/buildenv/builder.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl index 7f1be3925443..c505473ee722 100755 --- a/pkgs/build-support/buildenv/builder.pl +++ b/pkgs/build-support/buildenv/builder.pl @@ -96,11 +96,11 @@ sub findFiles { } unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { - if ($checkCollisionContents && checkCollision($oldTarget, $target)) { - return; - } elsif ($ignoreCollisions) { + if ($ignoreCollisions) { warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; return; + } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { + return; } else { die "collision between `$target' and `$oldTarget'\n"; } |