public/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
2016-01-18 03:56:09 +01:00
parent 4529ed1259
commit bfb11fd030
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/buildenv/builder.pl
+3 -3
View File
@@ -96,11 +96,11 @@ sub findFiles {
} }
unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
if ($checkCollisionContents && checkCollision($oldTarget, $target)) { if ($ignoreCollisions) {
return;
} elsif ($ignoreCollisions) {
warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1;
return; return;
} elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) {
return;
} else { } else {
die "collision between `$target' and `$oldTarget'\n"; die "collision between `$target' and `$oldTarget'\n";
} }