fixes after rebase

libmamba/CMakeLists.txt

@@ -162,6 +162,7 @@ set(LIBMAMBA_HEADERS
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util_os.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util_random.hpp
+    ${LIBMAMBA_INCLUDE_DIR}/mamba/core/util_scope.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/validate.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/virtual_packages.hpp
     ${LIBMAMBA_INCLUDE_DIR}/mamba/core/env_lockfile.hpp

libmamba/include/mamba/core/error_handling.hpp

@@ -24,7 +24,6 @@ namespace mamba
         cache_not_loaded,
         repodata_not_loaded,
         configurable_bad_cast,
-        aggregated
         env_lockfile_parsing_failed,
     };
 

libmamba/include/mamba/core/util.hpp

@@ -326,40 +326,6 @@ namespace mamba
     std::tuple<std::vector<std::string>, std::unique_ptr<TemporaryFile>> prepare_wrapped_call(
         const fs::path& prefix, const std::vector<std::string>& cmd);
 
-
-    template <typename F>
-    struct on_scope_exit
-    {
-        F func;
-
-        explicit on_scope_exit(F&& f)
-            : func(std::forward<F>(f))
-        {
-        }
-
-        ~on_scope_exit()
-        {
-            try
-            {
-                func();
-            }
-            catch (const std::exception& ex)
-            {
-                LOG_ERROR << fmt::format("Scope exit error (catched and ignored): {}", ex.what());
-            }
-            catch (...)
-            {
-                LOG_ERROR << "Scope exit unknown error (catched and ignored)";
-            }
-        }
-
-        // Deactivate copy & move until we implement moves
-        on_scope_exit(const on_scope_exit&) = delete;
-        on_scope_exit& operator=(const on_scope_exit&) = delete;
-        on_scope_exit(on_scope_exit&&) = delete;
-        on_scope_exit& operator=(on_scope_exit&&) = delete;
-    };
-
     /// Returns `true` if the filename matches names of files which should be interpreted as YAML.
     /// NOTE: this does not check if the file exists.
     inline bool is_yaml_file_name(const std::string_view filename)

libmamba/include/mamba/core/util_scope.hpp

@@ -0,0 +1,45 @@
+
+#ifndef MAMBA_CORE_UTIL_SCOPE_HPP
+#define MAMBA_CORE_UTIL_SCOPE_HPP
+
+#include <stdexcept>
+#include "mamba/core/output.hpp"
+
+namespace mamba
+{
+
+    template <typename F>
+    struct on_scope_exit
+    {
+        F func;
+
+        explicit on_scope_exit(F&& f)
+            : func(std::forward<F>(f))
+        {
+        }
+
+        ~on_scope_exit()
+        {
+            try
+            {
+                func();
+            }
+            catch (const std::exception& ex)
+            {
+                LOG_ERROR << fmt::format("Scope exit error (catched and ignored): {}", ex.what());
+            }
+            catch (...)
+            {
+                LOG_ERROR << "Scope exit unknown error (catched and ignored)";
+            }
+        }
+
+        // Deactivate copy & move until we implement moves
+        on_scope_exit(const on_scope_exit&) = delete;
+        on_scope_exit& operator=(const on_scope_exit&) = delete;
+        on_scope_exit(on_scope_exit&&) = delete;
+        on_scope_exit& operator=(on_scope_exit&&) = delete;
+    };
+}
+
+#endif

libmamba/src/core/env_lockfile.cpp

@@ -7,6 +7,7 @@
 #include "mamba/core/env_lockfile.hpp"
 
 #include <yaml-cpp/yaml.h>
+#include "mamba/core/output.hpp"
 
 #include "mamba/core/match_spec.hpp"
 

libmamba/src/core/transaction.cpp

@@ -15,6 +15,7 @@
 #include "mamba/core/output.hpp"
 #include "mamba/core/pool.hpp"
 #include "mamba/core/thread_utils.hpp"
+#include "mamba/core/util_scope.hpp"
 
 #include "termcolor/termcolor.hpp"
 

libmamba/tests/test_util.cpp

@@ -4,6 +4,8 @@
 
 #include "mamba/core/util.hpp"
 #include "mamba/core/util_random.hpp"
+#include "mamba/core/util_scope.hpp"
+
 
 namespace mamba
 {