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

Fully switch to zplists.

Browse Source
This commit is contained in:
Juan RP 2014-10-17 10:27:58 +02:00
parent b1eb62a2df
commit adc0643ee4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xbps-pkgdb/check.c
View File

@ -94,7 +94,7 @@ check_pkg_integrity(struct xbps_handle *xhp,
if (xbps_dictionary_get_cstring_nocopy(opkgd, "metafile-sha256", &sha256)) { if (xbps_dictionary_get_cstring_nocopy(opkgd, "metafile-sha256", &sha256)) {
buf = xbps_xasprintf("%s/.%s-files.plist", buf = xbps_xasprintf("%s/.%s-files.plist",
xhp->metadir, pkgname); xhp->metadir, pkgname);
filesd = xbps_dictionary_internalize_from_file(buf); filesd = xbps_dictionary_internalize_from_zfile(buf);
rv = xbps_file_hash_check(buf, sha256); rv = xbps_file_hash_check(buf, sha256);
free(buf); free(buf);
if (rv == ENOENT) { if (rv == ENOENT) {

2
lib/package_remove.c
View File

@ -268,7 +268,7 @@ xbps_remove_pkg(struct xbps_handle *xhp, const char *pkgver, bool update)
/* internalize pkg files dictionary from metadir */ /* internalize pkg files dictionary from metadir */
snprintf(metafile, sizeof(metafile), "%s/.%s-files.plist", xhp->metadir, pkgname); snprintf(metafile, sizeof(metafile), "%s/.%s-files.plist", xhp->metadir, pkgname);
pkgfilesd = xbps_dictionary_internalize_from_file(metafile); pkgfilesd = xbps_dictionary_internalize_from_zfile(metafile);
if (pkgfilesd == NULL) if (pkgfilesd == NULL)
xbps_dbg_printf(xhp, "WARNING: metaplist for %s " xbps_dbg_printf(xhp, "WARNING: metaplist for %s "
"doesn't exist!\n", pkgver); "doesn't exist!\n", pkgver);