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

Properly fix fa1d543dfa.

Browse Source
This commit is contained in:
Juan RP 2013-02-02 18:15:00 +01:00
parent 5eb6206c12
commit 0812ef2c35
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/package_conflicts.c
View File

@ -40,7 +40,7 @@ xbps_pkg_find_conflicts(struct xbps_handle *xhp,
prop_dictionary_t pkgd; prop_dictionary_t pkgd;
prop_object_t obj; prop_object_t obj;
prop_object_iterator_t iter; prop_object_iterator_t iter;
const char *cfpkg, *repopkgver, *pkgver; const char *cfpkg, *repopkgver, *pkgver, *pkgname, *repopkgname;
char *buf; char *buf;
pkg_cflicts = prop_dictionary_get(pkg_repod, "conflicts"); pkg_cflicts = prop_dictionary_get(pkg_repod, "conflicts");
@ -49,6 +49,7 @@ xbps_pkg_find_conflicts(struct xbps_handle *xhp,
trans_cflicts = prop_dictionary_get(xhp->transd, "conflicts"); trans_cflicts = prop_dictionary_get(xhp->transd, "conflicts");
prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver); prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgver", &repopkgver);
prop_dictionary_get_cstring_nocopy(pkg_repod, "pkgname", &repopkgname);
iter = prop_array_iterator(pkg_cflicts); iter = prop_array_iterator(pkg_cflicts);
assert(iter); assert(iter);
@ -62,10 +63,12 @@ xbps_pkg_find_conflicts(struct xbps_handle *xhp,
if ((pkgd = xbps_pkgdb_get_pkg(xhp, cfpkg)) || if ((pkgd = xbps_pkgdb_get_pkg(xhp, cfpkg)) ||
(pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) { (pkgd = xbps_pkgdb_get_virtualpkg(xhp, cfpkg))) {
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgname", &pkgname);
if (strcmp(pkgver, repopkgver) == 0) if (strcmp(pkgname, repopkgname) == 0)
continue; continue;
prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver);
xbps_dbg_printf(xhp, "found conflicting installed " xbps_dbg_printf(xhp, "found conflicting installed "
"pkg %s with pkg in transaction %s\n", pkgver, "pkg %s with pkg in transaction %s\n", pkgver,
repopkgver); repopkgver);
@ -81,10 +84,12 @@ xbps_pkg_find_conflicts(struct xbps_handle *xhp,
if ((pkgd = xbps_find_pkg_in_array(unsorted, cfpkg)) || if ((pkgd = xbps_find_pkg_in_array(unsorted, cfpkg)) ||
(pkgd = xbps_find_virtualpkg_in_array(xhp, unsorted, cfpkg))) { (pkgd = xbps_find_virtualpkg_in_array(xhp, unsorted, cfpkg))) {
prop_dictionary_get_cstring_nocopy(pkgd, prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver); "pkgname", &pkgname);
if (strcmp(pkgver, repopkgver) == 0) if (strcmp(pkgname, repopkgname) == 0)
continue; continue;
prop_dictionary_get_cstring_nocopy(pkgd,
"pkgver", &pkgver);
xbps_dbg_printf(xhp, "found conflicting pkgs in " xbps_dbg_printf(xhp, "found conflicting pkgs in "
"transaction %s <-> %s\n", pkgver, repopkgver); "transaction %s <-> %s\n", pkgver, repopkgver);
buf = xbps_xasprintf("%s conflicts with " buf = xbps_xasprintf("%s conflicts with "