diff options
| author | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-06-27 10:23:11 +0200 |
| commit | 425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c (patch) | |
| tree | 44479010890dd9aaf8bc52cab73f7c241a2fd9ea /nix | |
| parent | fe9f2d150019b9fc17f08f5a002d7ca932fc3eb0 (diff) | |
| parent | 88dbef3b9868a565da1eba37c9d409cce972becc (diff) | |
| download | guix-425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c.tar.gz guix-425fd7eb6a5f07eb9b854a5a29488e6f0b0acf3c.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/boost/.gitignore | 3 | ||||
| -rw-r--r-- | nix/libstore/.gitignore | 3 | ||||
| -rw-r--r-- | nix/libstore/optimise-store.cc | 3 | ||||
| -rw-r--r-- | nix/libutil/.gitignore | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/nix/boost/.gitignore b/nix/boost/.gitignore deleted file mode 100644 index 1f188e3b65..0000000000 --- a/nix/boost/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.hpp -*.cpp -*.cc diff --git a/nix/libstore/.gitignore b/nix/libstore/.gitignore index 512a0d022f..805301d6d7 100644 --- a/nix/libstore/.gitignore +++ b/nix/libstore/.gitignore @@ -1,3 +1,2 @@ -*.cc -*.hh /schema.sql +/schema.sql.hh diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index d8f8d2394b..eb303ab4c3 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -215,9 +215,10 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa /* Atomically replace the old file with the new hard link. */ if (rename(tempLink.c_str(), path.c_str()) == -1) { + int renameErrno = errno; if (unlink(tempLink.c_str()) == -1) printMsg(lvlError, format("unable to unlink `%1%'") % tempLink); - if (errno == EMLINK) { + if (renameErrno == EMLINK) { /* Some filesystems generate too many links on the rename, rather than on the original link. (Probably it temporarily increases the st_nlink field before diff --git a/nix/libutil/.gitignore b/nix/libutil/.gitignore deleted file mode 100644 index e539428b1b..0000000000 --- a/nix/libutil/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.cc -*.hh |