diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2021-12-02 15:27:42 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-12-08 15:46:36 +0300 |
commit | c9d13dff940ab16e28f2440a819a0151a3a7543f (patch) | |
tree | fbb37b3b575dc4f70c0fa1384a96c4a18bd0b58f /bpkg/pkg-configure.cxx | |
parent | dfb2b32071be8003c9048128cc8cf52bf2137d30 (diff) |
Prepare for supporting multiple dependencies in dependency alternative
Diffstat (limited to 'bpkg/pkg-configure.cxx')
-rw-r--r-- | bpkg/pkg-configure.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index 65718ca..96f3607 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -28,16 +28,19 @@ namespace bpkg { package_prerequisites r; - for (const dependency_alternatives_ex& da: deps) + for (const dependency_alternatives_ex& das: deps) { - assert (!da.conditional); //@@ TODO + assert (!das.conditional); //@@ TODO bool satisfied (false); - for (const dependency& d: da) + for (const dependency_alternative& da: das) { + assert (da.size () == 1); // @@ DEP + + const dependency& d (da[0]); const package_name& n (d.name); - if (da.buildtime) + if (das.buildtime) { // Handle special names. // @@ -63,12 +66,12 @@ namespace bpkg } } - database* ddb (fdb ? fdb (db, n, da.buildtime) : nullptr); + database* ddb (fdb ? fdb (db, n, das.buildtime) : nullptr); pair<shared_ptr<selected_package>, database*> spd ( ddb != nullptr ? make_pair (ddb->find<selected_package> (n), ddb) - : find_dependency (db, n, da.buildtime)); + : find_dependency (db, n, das.buildtime)); if (const shared_ptr<selected_package>& dp = spd.first) { @@ -111,7 +114,7 @@ namespace bpkg } if (!satisfied) - fail << "no configured package satisfies dependency on " << da; + fail << "no configured package satisfies dependency on " << das; } return r; |