From c504a73f08d49acc5af1d68636988e3827dec26d Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 8 Mar 2013 10:11:16 +0100 Subject: [PATCH] Re-use pkgname from unpack to handle config files. --- include/xbps_api_impl.h | 1 + lib/package_config_files.c | 5 +++-- lib/package_unpack.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/xbps_api_impl.h b/include/xbps_api_impl.h index effe2ac6..a36d65a7 100644 --- a/include/xbps_api_impl.h +++ b/include/xbps_api_impl.h @@ -147,6 +147,7 @@ int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *, prop_dictionary_t, struct archive_entry *, const char *, + const char *, const char *); /** * @private diff --git a/lib/package_config_files.c b/lib/package_config_files.c index 7434935b..f89c37f7 100644 --- a/lib/package_config_files.c +++ b/lib/package_config_files.c @@ -64,7 +64,8 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp, prop_dictionary_t filesd, struct archive_entry *entry, const char *entry_pname, - const char *pkgver) + const char *pkgver, + const char *pkgname) { prop_dictionary_t forigd; prop_object_t obj, obj2; @@ -89,7 +90,7 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp, xbps_dbg_printf(xhp, "%s: processing conf_file %s\n", pkgver, entry_pname); - forigd = xbps_pkgdb_get_pkg_metadata(xhp, pkgver); + forigd = xbps_pkgdb_get_pkg_metadata(xhp, pkgname); if (forigd == NULL) { xbps_dbg_printf(xhp, "%s: conf_file %s not currently " "installed\n", pkgver, entry_pname); diff --git a/lib/package_unpack.c b/lib/package_unpack.c index a0c15b86..e27e9e48 100644 --- a/lib/package_unpack.c +++ b/lib/package_unpack.c @@ -310,7 +310,8 @@ unpack_archive(struct xbps_handle *xhp, xucd.entry_is_conf = true; rv = xbps_entry_install_conf_file(xhp, - filesd, entry, entry_pname, pkgver); + filesd, entry, entry_pname, pkgver, + pkgname); if (rv == -1) { /* error */ goto out;