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

xbps_dictionary_from_metadata_plist: if pkgname not found try from a

Browse Source 
virtual pkg.
This commit is contained in:
Juan RP 2011-10-16 10:27:02 +02:00
parent a59f48585f
commit 0f0c66fafb
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/plist.c
View File

@ -195,18 +195,25 @@ xbps_dictionary_from_metadata_plist(const char *pkgname,
assert(plist != NULL); assert(plist != NULL);
xhp = xbps_handle_get(); xhp = xbps_handle_get();
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
if (pkgd) {
prop_dictionary_get_cstring_nocopy(pkgd, "pkgname", &rpkgname);
prop_object_release(pkgd);
pkgname = rpkgname;
}
plistf = xbps_xasprintf("%s/%s/metadata/%s/%s", plistf = xbps_xasprintf("%s/%s/metadata/%s/%s",
xhp->rootdir, XBPS_META_PATH, pkgname, plist); xhp->rootdir, XBPS_META_PATH, pkgname, plist);
if (plistf == NULL) if (plistf == NULL)
return NULL; return NULL;
if (access(plistf, R_OK) == -1) {
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
if (pkgd) {
prop_dictionary_get_cstring_nocopy(pkgd, "pkgname", &rpkgname);
prop_object_release(pkgd);
pkgname = rpkgname;
}
free(plistf);
plistf = xbps_xasprintf("%s/%s/metadata/%s/%s",
xhp->rootdir, XBPS_META_PATH, pkgname, plist);
if (plistf == NULL)
return NULL;
}
plistd = prop_dictionary_internalize_from_zfile(plistf); plistd = prop_dictionary_internalize_from_zfile(plistf);
free(plistf); free(plistf);
if (plistd == NULL) { if (plistd == NULL) {