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

Re-use pkgname from unpack to handle config files.

Browse Source
This commit is contained in:
Juan RP 2013-03-08 10:11:16 +01:00
parent faacbd4a96
commit c504a73f08
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/xbps_api_impl.h
View File

@ -147,6 +147,7 @@ int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *,
prop_dictionary_t, prop_dictionary_t,
struct archive_entry *, struct archive_entry *,
const char *, const char *,
const char *,
const char *); const char *);
/** /**
* @private * @private

5
lib/package_config_files.c
View File

@ -64,7 +64,8 @@ xbps_entry_install_conf_file(struct xbps_handle *xhp,
prop_dictionary_t filesd, prop_dictionary_t filesd,
struct archive_entry *entry, struct archive_entry *entry,
const char *entry_pname, const char *entry_pname,
const char *pkgver) const char *pkgver,
const char *pkgname)
{ {
prop_dictionary_t forigd; prop_dictionary_t forigd;
prop_object_t obj, obj2; 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", xbps_dbg_printf(xhp, "%s: processing conf_file %s\n",
pkgver, entry_pname); pkgver, entry_pname);
forigd = xbps_pkgdb_get_pkg_metadata(xhp, pkgver); forigd = xbps_pkgdb_get_pkg_metadata(xhp, pkgname);
if (forigd == NULL) { if (forigd == NULL) {
xbps_dbg_printf(xhp, "%s: conf_file %s not currently " xbps_dbg_printf(xhp, "%s: conf_file %s not currently "
"installed\n", pkgver, entry_pname); "installed\n", pkgver, entry_pname);

3
lib/package_unpack.c
View File

@ -310,7 +310,8 @@ unpack_archive(struct xbps_handle *xhp,
xucd.entry_is_conf = true; xucd.entry_is_conf = true;
rv = xbps_entry_install_conf_file(xhp, rv = xbps_entry_install_conf_file(xhp,
filesd, entry, entry_pname, pkgver); filesd, entry, entry_pname, pkgver,
pkgname);
if (rv == -1) { if (rv == -1) {
/* error */ /* error */
goto out; goto out;