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

buildEnv: Skip content check on ignoreCollisions.

Browse Source 
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>
This commit is contained in:
aszlig 2014-11-23 23:11:06 +01:00
parent 4529ed1259
commit bfb11fd030
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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";
}