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

xbps-bin: fix assertion with pkgs containing the "replaces" obj.

Browse Source 
--HG--
extra : convert_revision : xtraeme%40gmail.com-20091129045149-l8zvcbo1w1jzglai
This commit is contained in:
Juan RP 2009-11-29 05:51:49 +01:00
parent 1a5d19dca2
commit 4e38be11f4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/xbps-bin/install.c
View File

@ -393,6 +393,9 @@ xbps_exec_transaction(const char *pkgname, bool force, bool update)
show_missing_deps(trans->dict, pkgname); show_missing_deps(trans->dict, pkgname);
goto out2; goto out2;
} }
DPRINTF(("%s", prop_dictionary_externalize(trans->dict)));
if (update) { if (update) {
/* /*
* Sort the package transaction dictionary. * Sort the package transaction dictionary.
@ -436,7 +439,7 @@ replace_packages(prop_object_iterator_t iter, const char *pkgver)
{ {
prop_dictionary_t instd; prop_dictionary_t instd;
prop_object_t obj; prop_object_t obj;
const char *reppkgn; const char *reppkgn, *version;
int rv = 0; int rv = 0;
/* /*
@ -454,7 +457,8 @@ replace_packages(prop_object_iterator_t iter, const char *pkgver)
printf("Replacing package '%s' with '%s' ...\n", printf("Replacing package '%s' with '%s' ...\n",
reppkgn, pkgver); reppkgn, pkgver);
if ((rv = xbps_remove_pkg(reppkgn, NULL, false)) != 0) { version = xbps_get_pkg_version(pkgver);
if ((rv = xbps_remove_pkg(reppkgn, version, false)) != 0) {
printf("Couldn't remove %s (%s)\n", printf("Couldn't remove %s (%s)\n",
reppkgn, strerror(rv)); reppkgn, strerror(rv));
return rv; return rv;