emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 29765271e correctly.

Browse Source 
xbps_find_virtualpkg_in_conf() needs to look at the vpkgs set up in
configuration files, not from those set by pkgdb.

As a result of this the two test cases that were failing yesterday are now
fixed.
This commit is contained in:
Juan RP
2016-03-24 10:23:20 +01:00
parent fa635399f0
commit 35ad10ccbd
5 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/initend.c
View File

@@ -68,6 +68,9 @@ store_vars(struct xbps_handle *xhp, xbps_dictionary_t *d,
if (*d == NULL)
*d = xbps_dictionary_create();
if (xhp->vpkgd_conf)
xhp->vpkgd_conf = xbps_dictionary_create();
/*
* Parse strings delimited by ':' i.e
* <left>:<right>
@@ -85,6 +88,7 @@ store_vars(struct xbps_handle *xhp, xbps_dictionary_t *d,
rp++;
xbps_dictionary_set_cstring(*d, lp, rp);
xbps_dictionary_set_cstring(xhp->vpkgd_conf, lp, rp);
xbps_dbg_printf(xhp, "%s: added %s %s for %s\n", path, key, lp, rp);
}