sim: fix "backup restore" removing bin/ and lib/ subdirectories

varqox · Oct 13, 2024 · 0a58f47 · 0a58f47
1 parent c04458f
commit 0a58f47
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/subprojects/sim/src/backup.cc b/subprojects/sim/src/backup.cc
@@ -26,6 +26,7 @@
 #include <simlib/syscalls.hh>
 #include <simlib/throw_assert.hh>
 #include <simlib/to_arg_seq.hh>
+#include <simlib/utilities.hh>
 #include <simlib/working_directory.hh>
 #include <string>
 #include <string_view>
@@ -359,7 +360,7 @@ void restore(ArgSeq::Iter begin, ArgSeq::Iter end) {
         for_each_dir_component(dir_path, [&](dirent* entry) {
             auto filename = string_view{entry->d_name};
             path += filename;
-            if (path != DEFAULT_BACKUP_REPOSITORY_PATH) {
+            if (!is_one_of(path, DEFAULT_BACKUP_REPOSITORY_PATH, "bin", "lib")) {
                 bool absent = paths_present_in_backup.find(path) == paths_present_in_backup.end();
                 if (entry->d_type == DT_DIR) {
                     path += '/';