Compare commits
2 Commits
de51b03cc1
...
95086643fa
Author | SHA1 | Date |
---|---|---|
Ariadne Conill | 95086643fa | |
Ariadne Conill | fe69ccc6b9 |
14
cli/main.c
14
cli/main.c
|
@ -1119,7 +1119,6 @@ main(int argc, char *argv[])
|
|||
(want_flags & PKG_REQUIRES_PRIVATE) == PKG_REQUIRES_PRIVATE ||
|
||||
(want_flags & PKG_PROVIDES) == PKG_PROVIDES ||
|
||||
(want_flags & PKG_VARIABLES) == PKG_VARIABLES ||
|
||||
(want_flags & PKG_MODVERSION) == PKG_MODVERSION ||
|
||||
(want_flags & PKG_PATH) == PKG_PATH ||
|
||||
want_variable != NULL))
|
||||
{
|
||||
|
@ -1127,6 +1126,10 @@ main(int argc, char *argv[])
|
|||
maximum_traverse_depth = 1;
|
||||
}
|
||||
|
||||
/* we also want to walk only the flattened dependencies if we are requesting --modversion. */
|
||||
if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION)
|
||||
maximum_traverse_depth = 1;
|
||||
|
||||
if (getenv("PKG_CONFIG_ALLOW_SYSTEM_CFLAGS") != NULL)
|
||||
want_flags |= PKG_KEEP_SYSTEM_CFLAGS;
|
||||
|
||||
|
@ -1326,16 +1329,7 @@ cleanup3:
|
|||
* the limit, stop adding packages to the queue.
|
||||
*/
|
||||
if (maximum_package_count > 0 && pkgq.length >= maximum_package_count)
|
||||
{
|
||||
if ((want_flags & PKG_MODVERSION) == PKG_MODVERSION)
|
||||
{
|
||||
fprintf(stderr, "pkgconf: --modversion requested with multiple packages, output would be ambiguous\n");
|
||||
ret = EXIT_FAILURE;
|
||||
goto out;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
while (isspace((unsigned char)package[0]))
|
||||
package++;
|
||||
|
|
Loading…
Reference in New Issue