aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2019-09-28 20:47:17 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2019-09-28 20:47:17 +0300
commitdc8aa85f3d78fccf204530c8db6baf68229edf5e (patch)
tree4d2d52e07644369d6d9def84dbb6724523698fab
parentcdcb44468670b2f557070c43f2ca6dd389eda03c (diff)
Adapt to swapping of entry and pattern parameters in butl::path_match()
-rw-r--r--mod/build-config-module.cxx8
-rw-r--r--mod/mod-build-task.cxx4
-rw-r--r--mod/mod-builds.cxx4
3 files changed, 8 insertions, 8 deletions
diff --git a/mod/build-config-module.cxx b/mod/build-config-module.cxx
index 1efc514..028c956 100644
--- a/mod/build-config-module.cxx
+++ b/mod/build-config-module.cxx
@@ -310,13 +310,13 @@ namespace brep
for (const build_constraint& c: constrs)
{
- if (path_match (dash_components_to_path (c.config),
- cn,
+ if (path_match (cn,
+ dash_components_to_path (c.config),
dir_path () /* start */,
path_match_flags::match_absent) &&
(!c.target ||
- path_match (dash_components_to_path (*c.target),
- tg,
+ path_match (tg,
+ dash_components_to_path (*c.target),
dir_path () /* start */,
path_match_flags::match_absent)))
{
diff --git a/mod/mod-build-task.cxx b/mod/mod-build-task.cxx
index 030c41d..7edc14a 100644
--- a/mod/mod-build-task.cxx
+++ b/mod/mod-build-task.cxx
@@ -160,8 +160,8 @@ handle (request& rq, response& rs)
//
try
{
- if (path_match (dash_components_to_path (c.machine_pattern),
- dash_components_to_path (m.name),
+ if (path_match (dash_components_to_path (m.name),
+ dash_components_to_path (c.machine_pattern),
dir_path () /* start */,
path_match_flags::match_absent) &&
cfg_machines.insert (
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx
index 640c172..ec469a4 100644
--- a/mod/mod-builds.cxx
+++ b/mod/mod-builds.cxx
@@ -755,11 +755,11 @@ handle (request& rq, response& rs)
for (const auto& c: *build_conf_)
{
- if ((pc.empty () || path_match (pc, c.name)) && // Filter by name.
+ if ((pc.empty () || path_match (c.name, pc)) && // Filter by name.
// Filter by target.
//
- (tg.empty () || path_match (tg, c.target.string ())) &&
+ (tg.empty () || path_match (c.target.string (), tg)) &&
(!exclude_hidden || belongs (c, "all"))) // Filter hidden.
{