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

Merge pull request #5096 from aszlig/buildenv-check-collision-contents

Browse Source 
buildEnv: Check the content of colliding paths.
This commit is contained in:
Domen Kožar 2016-01-19 01:00:09 +01:00
commit 3b381d37ee
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ use Cwd 'abs_path';
use IO::Handle; use IO::Handle;
use File::Path; use File::Path;
use File::Basename; use File::Basename;
use File::Compare;
use JSON::PP; use JSON::PP;
STDOUT->autoflush(1); STDOUT->autoflush(1);
@ -38,7 +39,7 @@ for my $p (@pathsToLink) {
sub findFiles; sub findFiles;
sub findFilesInDir { sub findFilesInDir {
my ($relName, $target, $ignoreCollisions, $priority) = @_; my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
opendir DIR, "$target" or die "cannot open `$target': $!"; opendir DIR, "$target" or die "cannot open `$target': $!";
my @names = readdir DIR or die; my @names = readdir DIR or die;
@ -46,12 +47,28 @@ sub findFilesInDir {
foreach my $name (@names) { foreach my $name (@names) {
next if $name eq "." || $name eq ".."; next if $name eq "." || $name eq "..";
findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $priority); findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority);
} }
} }
sub checkCollision {
my ($path1, $path2) = @_;
my $stat1 = (stat($path1))[2];
my $stat2 = (stat($path2))[2];
if ($stat1 != $stat2) {
warn "different permissions in `$path1' and `$path2': "
. sprintf("%04o", $stat1 & 07777) . " <-> "
. sprintf("%04o", $stat2 & 07777);
return 0;
}
return compare($path1, $path2) == 0;
}
sub findFiles { sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $priority) = @_; my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
# Urgh, hacky... # Urgh, hacky...
return if return if
@ -82,13 +99,15 @@ sub findFiles {
if ($ignoreCollisions) { if ($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";
} }
} }
findFilesInDir($relName, $oldTarget, $ignoreCollisions, $oldPriority) unless $oldTarget eq ""; findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
findFilesInDir($relName, $target, $ignoreCollisions, $priority); findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority);
$symlinks{$relName} = ["", $priority]; # denotes directory $symlinks{$relName} = ["", $priority]; # denotes directory
} }
@ -98,12 +117,12 @@ my %done;
my %postponed; my %postponed;
sub addPkg { sub addPkg {
my ($pkgDir, $ignoreCollisions, $priority) = @_; my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
return if (defined $done{$pkgDir}); return if (defined $done{$pkgDir});
$done{$pkgDir} = 1; $done{$pkgDir} = 1;
findFiles("", $pkgDir, "", $ignoreCollisions, $priority); findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority);
my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages"; my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
if (-e $propagatedFN) { if (-e $propagatedFN) {
@ -132,7 +151,11 @@ if (exists $ENV{"pkgsPath"}) {
# user. # user.
for my $pkg (@{decode_json $pkgs}) { for my $pkg (@{decode_json $pkgs}) {
for my $path (@{$pkg->{paths}}) { for my $path (@{$pkg->{paths}}) {
addPkg($path, $ENV{"ignoreCollisions"} eq "1", $pkg->{priority}) if -e $path; addPkg($path,
$ENV{"ignoreCollisions"} eq "1",
$ENV{"checkCollisionContents"} eq "1",
$pkg->{priority})
if -e $path;
} }
} }

8
pkgs/build-support/buildenv/default.nix
View File

@ -16,6 +16,10 @@
, # Whether to ignore collisions or abort. , # Whether to ignore collisions or abort.
ignoreCollisions ? false ignoreCollisions ? false
, # If there is a collision, check whether the contents and permissions match
# and only if not, throw a collision error.
checkCollisionContents ? true
, # The paths (relative to each element of `paths') that we want to , # The paths (relative to each element of `paths') that we want to
# symlink (e.g., ["/bin"]). Any file not inside any of the # symlink (e.g., ["/bin"]). Any file not inside any of the
# directories in the list is not symlinked. # directories in the list is not symlinked.
@ -39,7 +43,9 @@
}: }:
runCommand name runCommand name
rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs; rec {
inherit manifest ignoreCollisions checkCollisionContents passthru
meta pathsToLink extraPrefix postBuild buildInputs;
pkgs = builtins.toJSON (map (drv: { pkgs = builtins.toJSON (map (drv: {
paths = paths =
[ drv ] [ drv ]