Compare commits
2 Commits
a4033ab9c6
...
dd6a8e3fc7
Author | SHA1 | Date |
---|---|---|
Colin Gillespie | dd6a8e3fc7 | |
Ariadne Conill | 97d907ba93 |
|
@ -306,7 +306,7 @@ apply_modversion(pkgconf_client_t *client, pkgconf_pkg_t *world, void *data, int
|
||||||
pkgconf_dependency_t *dep = world_iter->data;
|
pkgconf_dependency_t *dep = world_iter->data;
|
||||||
pkgconf_pkg_t *pkg = dep->match;
|
pkgconf_pkg_t *pkg = dep->match;
|
||||||
|
|
||||||
if (strncmp(pkg->why, queue_node->package, strlen(pkg->why)))
|
if (strcmp(pkg->why, queue_node->package))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (pkg->version != NULL) {
|
if (pkg->version != NULL) {
|
||||||
|
@ -1341,7 +1341,8 @@ cleanup3:
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
const char *package = argv[pkg_optind];
|
char *package = argv[pkg_optind];
|
||||||
|
char *end;
|
||||||
|
|
||||||
if (package == NULL)
|
if (package == NULL)
|
||||||
break;
|
break;
|
||||||
|
@ -1361,6 +1362,10 @@ cleanup3:
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
end = package + strlen(package) - 1;
|
||||||
|
while(end > package && isspace((unsigned char)end[0])) end--;
|
||||||
|
end[1] = '\0';
|
||||||
|
|
||||||
if (argv[pkg_optind + 1] == NULL || !PKGCONF_IS_OPERATOR_CHAR(*(argv[pkg_optind + 1])))
|
if (argv[pkg_optind + 1] == NULL || !PKGCONF_IS_OPERATOR_CHAR(*(argv[pkg_optind + 1])))
|
||||||
{
|
{
|
||||||
pkgconf_queue_push(&pkgq, package);
|
pkgconf_queue_push(&pkgq, package);
|
||||||
|
|
Loading…
Reference in New Issue