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

Revert "Actually fix the regression introduced in 7b39c38" 

This reverts commit 5e5c418837.
pull/116/head
William Pitcock 2017-01-22 23:29:59 -06:00
parent 5554be4986
commit 0927ecf1c6
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpkgconf/pkg.c
View File

@ -1343,7 +1343,6 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
void *data,
int maxdepth)
{
unsigned int saved_flags = client->flags;
unsigned int eflags = PKGCONF_PKG_ERRF_OK;
if (maxdepth == 0)
@ -1354,7 +1353,6 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
if (func != NULL)
func(client, root, data);
}
client->flags &= ~PKGCONF_PKG_PKGF_SKIP_ROOT_VIRTUAL;
if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS))
{
@ -1377,7 +1375,6 @@ pkgconf_pkg_traverse(pkgconf_client_t *client,
if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags;
}
client->flags = saved_flags;
return eflags;
}