diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2023-04-04 14:10:27 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2023-04-04 14:10:27 +0200 |
| commit | 8b9701d2ad76a9a571c445b318557261a4922758 (patch) | |
| tree | 1de11ba8c7e1d465f4a95005d7115774696a2a87 /libbuild2/install/rule.cxx | |
| parent | 7b06ee81ab0e8a2199c4dce07ec67282c4f52f62 (diff) | |
Remove global override restriction from config.install.filter
Diffstat (limited to 'libbuild2/install/rule.cxx')
| -rw-r--r-- | libbuild2/install/rule.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libbuild2/install/rule.cxx b/libbuild2/install/rule.cxx index f8e3e05..c0fbe0c 100644 --- a/libbuild2/install/rule.cxx +++ b/libbuild2/install/rule.cxx @@ -807,8 +807,7 @@ namespace build2 // Note that this also means we won't have the directory entries in the // manifest created with dry-run. Probably not a big deal. // - if (ctx.dry_run || - !context_data::filter (rs, d, path (), entry_type::directory)) + if (ctx.dry_run || !filter_entry (rs, d, path (), entry_type::directory)) return; dir_path chd (chroot_path (rs, d)); @@ -890,7 +889,7 @@ namespace build2 const path& leaf (name.empty () ? f.leaf () : name); - if (!context_data::filter (rs, base.dir, leaf, entry_type::regular)) + if (!filter_entry (rs, base.dir, leaf, entry_type::regular)) return; path relf (relative (f)); @@ -959,7 +958,7 @@ namespace build2 context& ctx (rs.ctx); - if (!context_data::filter (rs, base.dir, link, entry_type::symlink)) + if (!filter_entry (rs, base.dir, link, entry_type::symlink)) return; if (link_target.absolute () && @@ -1173,8 +1172,7 @@ namespace build2 // See install_d() for the rationale. // - if (ctx.dry_run || - !context_data::filter (rs, d, path (), entry_type::directory)) + if (ctx.dry_run || !filter_entry (rs, d, path (), entry_type::directory)) return false; dir_path chd (chroot_path (rs, d)); @@ -1356,7 +1354,7 @@ namespace build2 const path& leaf (name.empty () ? t->path ().leaf () : name); - if (!context_data::filter (rs, base.dir, leaf, entry_type::regular)) + if (!filter_entry (rs, base.dir, leaf, entry_type::regular)) return false; dir_path chd (chroot_path (rs, base.dir)); @@ -1401,7 +1399,7 @@ namespace build2 { assert (link.simple () && !link.empty ()); - if (!context_data::filter (rs, base.dir, link, entry_type::symlink)) + if (!filter_entry (rs, base.dir, link, entry_type::symlink)) return false; dir_path chd (chroot_path (rs, base.dir)); |