diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2022-12-08 21:15:20 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2022-12-08 23:01:37 +0300 |
| commit | 2822c6d92f18f560ed49b9e052cd421f1f33750d (patch) | |
| tree | 58fd967994062eeed2a148f009cda540edd010e1 | |
| parent | f37129f4c6cc9e60f547fdfe0a28a984ddd8de73 (diff) | |
Adapt to dir_iterator API change
| -rw-r--r-- | bbot/agent/agent.cxx | 5 | ||||
| -rw-r--r-- | bbot/worker/worker.cxx | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index 3cfc4b8..7dc6794 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -512,8 +512,7 @@ try // The first level are machine volumes. // - for (const dir_entry& ve: dir_iterator (machines, - false /* ignore_dangling */)) + for (const dir_entry& ve: dir_iterator (machines, dir_iterator::no_follow)) { const string vn (ve.path ().string ()); @@ -528,7 +527,7 @@ try // try { - for (const dir_entry& me: dir_iterator (vd, false /* ignore_dangling */)) + for (const dir_entry& me: dir_iterator (vd, dir_iterator::no_follow)) { const string mn (me.path ().string ()); diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx index 0bf480f..1911fb0 100644 --- a/bbot/worker/worker.cxx +++ b/bbot/worker/worker.cxx @@ -17,7 +17,7 @@ #include <libbutl/b.hxx> #include <libbutl/pager.hxx> #include <libbutl/prompt.hxx> -#include <libbutl/utility.hxx> // to_utf8(), eof(), alpha() +#include <libbutl/utility.hxx> // to_utf8(), eof() #include <libbutl/timestamp.hxx> #include <libbutl/filesystem.hxx> #include <libbutl/string-parser.hxx> @@ -2629,6 +2629,8 @@ build (size_t argc, const char* argv[]) { dir_path pkg_dir; + // Note: doesn't follow symlinks. + // path_search (dir_path (pkg + "-*/"), [&pkg_dir] (path&& pe, const string&, bool interm) { @@ -2637,7 +2639,8 @@ build (size_t argc, const char* argv[]) return interm; }, - dist_root); + dist_root, + path_match_flags::none); if (!pkg_dir.empty ()) { |