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

refs/heads/sb/bb010g/libstore-mode

Browse source 
refs/heads/sb/bb010g/libstore-test-reproducibility
This commit is contained in:
Dusk Banks 2024-10-18 15:38:09 -07:00
parent e2d00ac3a8 40e1a34cb7 729b8c65c6
commit bd65dc4080
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/local-store.cc
View file

@ -691,13 +691,20 @@ static void canonicalisePathMetaData_(
if ((eaSize = llistxattr(path.c_str(), eaBuf.data(), eaBuf.size())) < 0) if ((eaSize = llistxattr(path.c_str(), eaBuf.data(), eaBuf.size())) < 0)
throw SysError("querying extended attributes of '%s'", path); throw SysError("querying extended attributes of '%s'", path);
if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) bool resetMode = false;
if ((S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) && !(st.st_mode & S_IWUSR)) {
resetMode = true;
chmod(path.c_str(), st.st_mode | S_IWUSR); chmod(path.c_str(), st.st_mode | S_IWUSR);
}
for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) { for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) {
if (settings.ignoredAcls.get().count(eaName)) continue; if (settings.ignoredAcls.get().count(eaName)) continue;
if (lremovexattr(path.c_str(), eaName.c_str()) == -1) if (lremovexattr(path.c_str(), eaName.c_str()) == -1)
throw SysError("removing extended attribute '%s' from '%s'", eaName, path); throw SysError("removing extended attribute '%s' from '%s'", eaName, path);
} }
if (resetMode) {
chmod(path.c_str(), st.st_mode);
resetMode = false;
}
} }
#endif #endif

6
tests/functional/flakes/flakes.sh
View file

@ -285,11 +285,11 @@ nix build -o $TEST_ROOT/result $flake3Dir#sth --commit-lock-file
Flake lock file updates: Flake lock file updates:
"?" Added input 'nonFlake': • Added input 'nonFlake':
'git+file://"*"/flakes/flakes/nonFlake?ref=refs/heads/master&rev="*"' "*" 'git+file://"*"/flakes/flakes/nonFlake?ref=refs/heads/master&rev="*"' "*"
"?" Added input 'nonFlakeFile': • Added input 'nonFlakeFile':
'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "*" 'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "*"
"?" Added input 'nonFlakeFile2': • Added input 'nonFlakeFile2':
'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "* ]] 'path:"*"/flakes/flakes/nonFlake/README.md?lastModified="*"&narHash=sha256-cPh6hp48IOdRxVV3xGd0PDgSxgzj5N/2cK0rMPNaR4o%3D' "* ]]
nix build -o $TEST_ROOT/result flake3#fnord nix build -o $TEST_ROOT/result flake3#fnord

2
tests/unit/libstore-support/tests/libstore.hh
View file

@ -4,6 +4,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include "globals.hh"
#include "store-api.hh" #include "store-api.hh"
namespace nix { namespace nix {
@ -11,6 +12,7 @@ namespace nix {
class LibStoreTest : public ::testing::Test { class LibStoreTest : public ::testing::Test {
public: public:
static void SetUpTestSuite() { static void SetUpTestSuite() {
settings.nixConfDir = "/dev/null"; // intentionally invalid path
initLibStore(); initLibStore();
} }