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

libxbps: make sure to not add dups in transaction for remove.

Browse Source
This commit is contained in:
Juan RP
2014-10-19 11:22:17 +02:00
parent fb868454b2
commit 231582e671
5 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction_ops.c
View File

@ -197,7 +197,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall)
free(pkgname);
return EINVAL;
}
if ((rv = xbps_transaction_store(xhp, pkgs, pkg_repod, state)) != 0) {
if ((rv = xbps_transaction_store(xhp, pkgs, pkg_repod)) != 0) {
free(pkgname);
return rv;
}
@ -310,7 +310,8 @@ xbps_transaction_remove_pkg(struct xbps_handle *xhp,
obj = xbps_array_get(orphans, count);
xbps_dictionary_get_cstring_nocopy(obj, "pkgver", &pkgver);
xbps_dictionary_set_cstring_nocopy(obj, "transaction", "remove");
xbps_array_add(pkgs, obj);
if ((rv = xbps_transaction_store(xhp, pkgs, obj)) != 0)
return EINVAL;
xbps_dbg_printf(xhp, "%s: added into transaction (remove).\n", pkgver);
}
reqby = xbps_pkgdb_get_pkg_revdeps(xhp, pkgname);
@ -331,7 +332,8 @@ rmpkg:
*/
xbps_dictionary_get_cstring_nocopy(pkgd, "pkgver", &pkgver);
xbps_dictionary_set_cstring_nocopy(pkgd, "transaction", "remove");
xbps_array_add(pkgs, pkgd);
if ((rv = xbps_transaction_store(xhp, pkgs, pkgd)) != 0)
return EINVAL;
xbps_dbg_printf(xhp, "%s: added into transaction (remove).\n", pkgver);
reqby = xbps_pkgdb_get_pkg_revdeps(xhp, pkgver);
/*