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

libxbps: xbps_dictionary_from_metadata_plist: respect pkgname arg.

Browse Source
This commit is contained in:
Juan RP 2011-10-30 08:01:25 +01:00
parent 39e8ada644
commit 07d47ab09a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/plist.c
View File

@ -216,39 +216,40 @@ xbps_dictionary_from_metadata_plist(const char *pkgname,
{ {
struct xbps_handle *xhp; struct xbps_handle *xhp;
prop_dictionary_t pkgd, plistd = NULL; prop_dictionary_t pkgd, plistd = NULL;
const char *rpkgname; const char *savedpkgname;
char *plistf; char *plistf;
assert(pkgname != NULL); assert(pkgname != NULL);
assert(plist != NULL); assert(plist != NULL);
xhp = xbps_handle_get(); xhp = xbps_handle_get();
savedpkgname = pkgname;
plistf = xbps_xasprintf("%s/%s/metadata/%s/%s", plistf = xbps_xasprintf("%s/%s/metadata/%s/%s",
prop_string_cstring_nocopy(xhp->rootdir), prop_string_cstring_nocopy(xhp->rootdir),
XBPS_META_PATH, pkgname, plist); XBPS_META_PATH, savedpkgname, plist);
if (plistf == NULL) if (plistf == NULL)
return NULL; return NULL;
if (access(plistf, R_OK) == -1) { if (access(plistf, R_OK) == -1) {
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false); pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
if (pkgd) { if (pkgd) {
prop_dictionary_get_cstring_nocopy(pkgd, "pkgname", &rpkgname); free(plistf);
prop_dictionary_get_cstring_nocopy(pkgd,
"pkgname", &savedpkgname);
plistf = xbps_xasprintf("%s/%s/metadata/%s/%s",
prop_string_cstring_nocopy(xhp->rootdir),
XBPS_META_PATH, savedpkgname, plist);
prop_object_release(pkgd); prop_object_release(pkgd);
pkgname = rpkgname; if (plistf == NULL)
return NULL;
} }
free(plistf);
plistf = xbps_xasprintf("%s/%s/metadata/%s/%s",
prop_string_cstring_nocopy(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) {
xbps_dbg_printf("cannot read from plist file %s for %s: %s\n", xbps_dbg_printf("cannot read from metadata %s for %s: %s\n",
plist, pkgname, strerror(errno)); plist, savedpkgname, strerror(errno));
return NULL; return NULL;
} }