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

Actually fix the regression introduced in 7b39c38

pull/116/head
Baptiste Daroussin 2017-01-22 11:25:05 +01:00
parent 17be554a21
commit 5e5c418837
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkgconf/pkg.c
View File

@ -1336,6 +1336,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
void *data, void *data,
int maxdepth) int maxdepth)
{ {
unsigned int saved_flags = client->flags;
unsigned int eflags = PKGCONF_PKG_ERRF_OK; unsigned int eflags = PKGCONF_PKG_ERRF_OK;
if (maxdepth == 0) if (maxdepth == 0)
@ -1346,6 +1347,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
if (func != NULL) if (func != NULL)
func(client, root, data); func(client, root, data);
} }
client->flags &= ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL;
if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS)) if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS))
{ {
@ -1368,6 +1370,7 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
if (eflags != PKGCONF_PKG_ERRF_OK) if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags; return eflags;
} }
client->flags = saved_flags;
return eflags; return eflags;
} }