Use standard C++ filesystem API only

mamba-org · May 10, 2022 · f80df10 · f80df10
1 parent 070b6e3
commit f80df10
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/libmamba/environment-dev.yml b/libmamba/environment-dev.yml
@@ -12,7 +12,6 @@ dependencies:
   - libcurl 7.82.0 *_0
   - gtest
   - gmock
-  - cpp-filesystem >=1.5.8
   - cpp-expected
   - reproc-cpp
   - yaml-cpp

diff --git a/libmamba/include/mamba/core/mamba_fs.hpp b/libmamba/include/mamba/core/mamba_fs.hpp
@@ -1,13 +1,8 @@
 #ifndef MAMBA_CORE_FS_HPP
 #define MAMBA_CORE_FS_HPP
 
-#ifdef MAMBA_USE_STD_FS
 #include <filesystem>
 #include <fstream>
 namespace fs = std::filesystem;
-#else
-#include "ghc/filesystem.hpp"
-namespace fs = ghc::filesystem;
-#endif
 
 #endif
diff --git a/libmamba/src/core/environments_manager.cpp b/libmamba/src/core/environments_manager.cpp
@@ -155,7 +155,15 @@ namespace mamba
         if (!fs::exists(env_txt_file))
             return {};
 
-        fs::path abs_loc = fs::absolute(location);
+        std::error_code fsabs_error;
+        fs::path abs_loc = fs::absolute(
+            location, fsabs_error);  // If it fails we just get the defaultly constructed path.
+        if (fsabs_error && !location.empty())  // Ignore cases where we got an empty location.
+        {
+            LOG_WARNING << fmt::format("Failed to get absolute path for location '{}' : {}",
+                                       location.string(),
+                                       fsabs_error.message());
+        }
 
         std::vector<std::string> lines = read_lines(env_txt_file);
         std::set<std::string> final_lines;

diff --git a/libmambapy/environment-dev.yml b/libmambapy/environment-dev.yml
@@ -12,7 +12,6 @@ dependencies:
   - libcurl 7.82.0 *_0
   - gtest
   - gmock
-  - cpp-filesystem >=1.5.8
   - cpp-expected
   - reproc-cpp
   - yaml-cpp

diff --git a/mamba/environment-dev.yml b/mamba/environment-dev.yml
@@ -12,7 +12,6 @@ dependencies:
   - libcurl 7.82.0 *_0
   - gtest
   - gmock
-  - cpp-filesystem >=1.5.8
   - cpp-expected
   - reproc-cpp
   - yaml-cpp

diff --git a/micromamba/environment-dev.yml b/micromamba/environment-dev.yml
@@ -12,7 +12,6 @@ dependencies:
   - libcurl 7.82.0 *_0
   - gtest
   - gmock
-  - cpp-filesystem >=1.5.8
   - cpp-expected
   - reproc-cpp
   - yaml-cpp