ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

cli: main: allow use of multiple package names in solution-based queries 

Query types like --print-requires, --print-requires-private and --print-provides
can be used in practice to query information about a calculated solution rather
than a single package.

Allow this to be done where it makes sense to allow it, while continuing to restrict
package-specific queries (like --variable= and --variables) to single packages.

Fixes: 541de8bd ("main: handle query selectors that are only usable for single packages correctly")
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Closes: #366
master
Ariadne Conill 2024-10-07 17:06:52 -07:00
parent a88c0d962a
commit 4697d636cc
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cli/main.c
View File

@ -1298,24 +1298,24 @@ main(int argc, char *argv[])
if ((want_flags & PKG_INTERNAL_CFLAGS) == PKG_INTERNAL_CFLAGS) if ((want_flags & PKG_INTERNAL_CFLAGS) == PKG_INTERNAL_CFLAGS)
want_client_flags |= PKGCONF_PKG_PKGF_DONT_FILTER_INTERNAL_CFLAGS; want_client_flags |= PKGCONF_PKG_PKGF_DONT_FILTER_INTERNAL_CFLAGS;
/* if these selectors are used, it means that we are inquiring about a single package. /* if these selectors are used, it means that we are querying metadata.
* so signal to libpkgconf that we do not want to use the dependency resolver for more than one level, * so signal to libpkgconf that we only want to walk the flattened dependency set.
* and also limit the SAT problem to a single package.
*/ */
if (((want_flags & PKG_REQUIRES) == PKG_REQUIRES || if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION ||
(want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE || (want_flags & PKG_REQUIRES) == PKG_REQUIRES ||
(want_flags & PKG_PROVIDES) == PKG_PROVIDES || (want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
(want_flags & PKG_VARIABLES) == PKG_VARIABLES || (want_flags & PKG_PROVIDES) == PKG_PROVIDES ||
(want_flags & PKG_PATH) == PKG_PATH || (want_flags & PKG_VARIABLES) == PKG_VARIABLES ||
want_variable != NULL)) (want_flags & PKG_PATH) == PKG_PATH)
{
maximum_package_count = 1;
maximum_traverse_depth = 1; maximum_traverse_depth = 1;
}
/* we also want to walk only the flattened dependencies if we are requesting --modversion. */ /* if we are asking for a variable, path or list of variables, this only makes sense
if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION) * for a single package.
maximum_traverse_depth = 1; */
if ((want_flags & PKG_VARIABLES) == PKG_VARIABLES ||
(want_flags & PKG_PATH) == PKG_PATH ||
want_variable != NULL)
maximum_package_count = 1;
if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL) if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL)
want_flags |= PKG_KEEP_SYSTEM_CFLAGS; want_flags |= PKG_KEEP_SYSTEM_CFLAGS;