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

lib/transaction_package_replace.c: simplify.

Browse Source
This commit is contained in:
Juan RP 2014-10-25 05:20:13 +02:00
parent 789326cf3a
commit b81dedb770
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/transaction_package_replace.c
View File

@ -85,20 +85,18 @@ xbps_transaction_package_replace(struct xbps_handle *xhp, xbps_array_t pkgs)
/* /*
* Make sure to not add duplicates. * Make sure to not add duplicates.
*/ */
xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto);
reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL); reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL);
if (reppkgd) { if (reppkgd) {
xbps_dictionary_get_cstring_nocopy(reppkgd, xbps_dictionary_get_cstring_nocopy(reppkgd,
"transaction", &tract); "transaction", &tract);
if (strcmp(tract, "remove") == 0) if (strcmp(tract, "remove") == 0)
continue; continue;
} /*
/* * Package contains replaces="pkgpattern", but the
* Package contains replaces="pkgpattern", but the * package that should be replaced is also in the
* package that should be replaced is also in the * transaction and it's going to be updated.
* transaction and it's going to be updated. */
*/
xbps_dictionary_get_bool(instd, "automatic-install", &instd_auto);
if ((reppkgd = xbps_find_pkg_in_array(pkgs, curpkgname, NULL))) {
xbps_dictionary_set_bool(reppkgd, xbps_dictionary_set_bool(reppkgd,
"automatic-install", instd_auto); "automatic-install", instd_auto);
xbps_dictionary_set_bool(reppkgd, xbps_dictionary_set_bool(reppkgd,