kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Don't chmod symlink before moving outputs around

Browse source 
Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
This commit is contained in:
John Ericson 2020-09-04 14:38:45 +00:00
parent b99062b023
commit c9f1ed912c
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/build.cc
View file

@ -4101,6 +4101,11 @@ void DerivationGoal::registerOutputs()
if (lstat(actualPath.c_str(), &st)) if (lstat(actualPath.c_str(), &st))
throw SysError("getting attributes of path '%1%'", actualPath); throw SysError("getting attributes of path '%1%'", actualPath);
mode |= 0200; mode |= 0200;
/* Try to change the perms, but only if the file isn't a
symlink as symlinks permissions are mostly ignored and
calling `chmod` on it will just forward the call to the
target of the link. */
if (!S_ISLNK(st.st_mode))
if (chmod(actualPath.c_str(), mode) == -1) if (chmod(actualPath.c_str(), mode) == -1)
throw SysError("changing mode of '%1%' to %2$o", actualPath, mode); throw SysError("changing mode of '%1%' to %2$o", actualPath, mode);
} }

3
tests/content-addressed.nix
View file

@ -16,11 +16,14 @@ rec {
}; };
rootCA = mkDerivation { rootCA = mkDerivation {
name = "dependent"; name = "dependent";
outputs = [ "out" "dev" ];
buildCommand = '' buildCommand = ''
echo "building a CA derivation" echo "building a CA derivation"
echo "The seed is ${toString seed}" echo "The seed is ${toString seed}"
mkdir -p $out mkdir -p $out
echo ${rootLegacy}/hello > $out/dep echo ${rootLegacy}/hello > $out/dep
# test symlink at root
ln -s $out $dev
''; '';
__contentAddressed = true; __contentAddressed = true;
outputHashMode = "recursive"; outputHashMode = "recursive";