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

xbps_dictionary_from_metadata_plist: fix this with empty regpkgdb.plist.

Browse Source 
If regpkgdb wasn't initialized it failed to properly internalize the
dictionary from the plist file.
This commit is contained in:
Juan RP 2011-07-27 11:23:25 +02:00
parent 6b02c28bd7
commit ce0b21a062
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/plist.c
View File

@ -196,14 +196,14 @@ xbps_dictionary_from_metadata_plist(const char *pkgname,
xhp = xbps_handle_get(); xhp = xbps_handle_get();
pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false); pkgd = xbps_find_virtualpkg_dict_installed(pkgname, false);
if (pkgd == NULL) if (pkgd) {
return NULL;
prop_dictionary_get_cstring_nocopy(pkgd, "pkgname", &rpkgname); prop_dictionary_get_cstring_nocopy(pkgd, "pkgname", &rpkgname);
prop_object_release(pkgd); 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, rpkgname, plist); xhp->rootdir, XBPS_META_PATH, pkgname, plist);
if (plistf == NULL) if (plistf == NULL)
return NULL; return NULL;
@ -211,7 +211,7 @@ xbps_dictionary_from_metadata_plist(const char *pkgname,
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 plist file %s for %s: %s\n",
plist, rpkgname, strerror(errno)); plist, pkgname, strerror(errno));
return NULL; return NULL;
} }