diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-16 05:08:11 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2022-06-16 09:44:17 +0200 |
| commit | 7f3273acb395c398869e0948150aaa8c30abcd1e (patch) | |
| tree | 5e9e3458444102edfbb8e567f2997d7b3fa44f42 | |
| parent | 4efa50de798dca461b16e51357c7faa83054e035 (diff) | |
Tighten condition when load_old_config() is called (temporarily disabled)
| -rw-r--r-- | bpkg/package-skeleton.cxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/bpkg/package-skeleton.cxx b/bpkg/package-skeleton.cxx index bc7120c..b4cb23c 100644 --- a/bpkg/package-skeleton.cxx +++ b/bpkg/package-skeleton.cxx @@ -338,7 +338,19 @@ namespace bpkg find_if (config_vars_.begin (), config_vars_.end (), [this] (const string& v) { + // For now tighten it even further so that we can continue + // using repositories without package skeleton information + // (bootstrap.build, root.build). See load_old_config() for + // details. + // +#if 1 // @@ TMP return project_override (v, var_prefix_); +#else + size_t vn; + size_t pn (var_prefix_.size ()); + return (project_override (v, var_prefix_, &vn) && + v.compare (pn, vn - pn, ".develop") == 0); +#endif }) == config_vars_.end (); if (src_root) @@ -2019,7 +2031,9 @@ namespace bpkg // variables are not bogus? But they could be untyped... // // Also, build2 warns about unused variables being dropped. - + // + // Note that currently load_old_config() is disabled unless there is + // a config.*.develop variable; see package_skeleton ctor. // Extract and merge old user configuration variables from config.build // (or equivalent) into config_vars. |