Explicitly set errNo for filesystem_errors

NixOS · Jul 11, 2024 · e0090fe · e0090fe
1 parent 749c037
commit e0090fe
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
@@ -795,7 +795,7 @@ static void movePath(const Path & src, const Path & dst)
         try {
             fs::permissions(src, st.permissions() | fs::perms::owner_write, permOpts);
         } catch (const fs::filesystem_error & e) {
-            throw SysError("setting permissions on '%s'", src);
+            throw SysError(e.code().value(), "setting permissions on '%s'", src);
         }
     }
 
@@ -805,7 +805,7 @@ static void movePath(const Path & src, const Path & dst)
         try {
             fs::permissions(dst, st.permissions(), permOpts);
         } catch (const fs::filesystem_error & e) {
-            throw SysError("setting permissions on '%s'", dst);
+            throw SysError(e.code().value(), "setting permissions on '%s'", dst);
         }
     }
 }

diff --git a/src/libstore/builtins/buildenv.cc b/src/libstore/builtins/buildenv.cc
@@ -53,7 +53,7 @@ static void createLinks(State & state, const Path & srcDir, const Path & dstDir,
                 continue;
             }
         } catch (fs::filesystem_error & e) {
-            throw SysError("getting status of '%1%'", srcFile);
+            throw SysError(e.code().value(), "getting status of '%1%'", srcFile);
         }
 
         /* The files below are special-cased to that they don't show

diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
@@ -26,7 +26,7 @@ static void makeWritable(const Path & path)
         std::filesystem::permissions(path, writePerms);
     }
     catch (std::filesystem::filesystem_error &e) {
-        throw SysError("changing writability of '%1%'", path);
+        throw SysError(e.code().value(), "changing writability of '%1%'", path);
     }
 }
 

diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
@@ -194,7 +194,7 @@ std::optional<fs::file_status> maybeSymlinkStat(const fs::path & path)
             return std::nullopt;
         return st;
     } catch (fs::filesystem_error & e) {
-        throw SystemError("getting status of '%s'", path);
+        throw SystemError(e.code().value(), "getting status of '%s'", path);
     }
 }
 
@@ -424,7 +424,7 @@ void createDirs(const Path & path)
     try {
         fs::create_directories(path);
     } catch (fs::filesystem_error & e) {
-        throw SysError("creating directory '%1%'", path);
+        throw SysError(e.code().value(), "creating directory '%1%'", path);
     }
 }