New function: xbps_get_pkg_dict_from_metadata_plist.

This function returns and internalized dictionary from a package's metadata
plist file as specified by its arguments.

Update all code to use it where appropiate.
This commit is contained in:
Juan RP
2010-11-08 03:14:41 +01:00
parent 25ebcd53f8
commit c3afb4f4fb
9 changed files with 56 additions and 96 deletions

View File

@ -110,15 +110,7 @@ xbps_check_pkg_integrity(const char *pkgname)
/*
* Check for props.plist metadata file.
*/
path = xbps_xasprintf("%s/%s/metadata/%s/%s", xbps_get_rootdir(),
XBPS_META_PATH, pkgname, XBPS_PKGPROPS);
if (path == NULL) {
rv = errno;
goto out;
}
propsd = prop_dictionary_internalize_from_zfile(path);
free(path);
propsd = xbps_get_pkg_dict_from_metadata_plist(pkgname, XBPS_PKGPROPS);
if (propsd == NULL) {
fprintf(stderr,
"E: %s: unexistent %s metadata file.\n", pkgname,
@ -142,15 +134,7 @@ xbps_check_pkg_integrity(const char *pkgname)
/*
* Check for files.plist metadata file.
*/
path = xbps_xasprintf("%s/%s/metadata/%s/%s", xbps_get_rootdir(),
XBPS_META_PATH, pkgname, XBPS_PKGFILES);
if (path == NULL) {
rv = errno;
goto out;
}
filesd = prop_dictionary_internalize_from_zfile(path);
free(path);
filesd = xbps_get_pkg_dict_from_metadata_plist(pkgname, XBPS_PKGFILES);
if (filesd == NULL) {
fprintf(stderr,
"E: %s: unexistent %s metadata file.\n", pkgname,