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

Introduce xbps_plist_{array,dictionary}_from_file().

Browse Source 
Those are a wrapper around xbps_{array,dictionary}_internalize_from_zfile()
that prints a debugging msg when the plist file cannot be internalized.

Update xbps to use these wrappers.
This commit is contained in:
Juan RP
2015-05-28 10:15:05 +02:00
parent c4ed1b5845
commit 769a997afb
9 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pkgdb_conversion.c
View File

@ -50,7 +50,7 @@ pkgdb038(struct xbps_handle *xhp, const char *opkgdb_plist)
* - <metadir>/pkgdb-0.38.plist
* - <metadir>/.<pkgname>-files.plist
*/
opkgdb = xbps_dictionary_internalize_from_zfile(opkgdb_plist);
opkgdb = xbps_plist_dictionary_from_file(xhp, opkgdb_plist);
if (opkgdb == NULL)
return EINVAL;
@ -93,7 +93,7 @@ pkgdb038(struct xbps_handle *xhp, const char *opkgdb_plist)
* Copy pkg metadata objs to the new pkgdb.
*/
pkgmeta = xbps_xasprintf("%s/.%s.plist", xhp->metadir, pkgname);
pkgmetad = xbps_dictionary_internalize_from_zfile(pkgmeta);
pkgmetad = xbps_plist_dictionary_from_file(xhp, pkgmeta);
if (pkgmetad == NULL) {
rv = EINVAL;
xbps_dbg_printf(xhp, "%s: cannot open %s: %s\n",