[pacman-dev] [PATCH] Cleanup code handling a sysupgrade of pacman itself

[Dan McGee]

Anyone have a problem with this change (Aaron)?

-Dan

---

The old code attempted to upgrade pacman by itself and automate the process
by creating a new transaction and a bunch of other complicated stuff. We
should just leave such actions to the user to decide instead of trying to
do it for them, and it caused problems when pulling in dependencies.

For now, simply request that the user run a 'pacman -S pacman' operation. If
they want, they can also answer 'N' at the prompt and the upgrade proceeds
as normal.

Signed-off-by: Dan McGee <dan at archlinux.org>
---
 src/pacman/sync.c |   19 +------------------
 1 files changed, 1 insertions(+), 18 deletions(-)

diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index 8982b95..25563e3 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -544,24 +544,7 @@ int pacman_sync(alpm_list_t *targets)
 				         ":: operation. If you wish to continue the operation and\n"
 				         ":: not upgrade pacman seperately, answer no.\n"));
 				if(yesno(_(":: Cancel current operation? [Y/n] "))) {
-					if(alpm_trans_release() == -1) {
-						fprintf(stderr, _("error: failed to release transaction (%s)\n"),
-						    alpm_strerror(pm_errno));
-						retval = 1;
-						goto cleanup;
-					}
-					if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags,
-					   cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) {
-						fprintf(stderr, _("error: failed to init transaction (%s)\n"),
-						    alpm_strerror(pm_errno));
-						return(1);
-					}
-					if(alpm_trans_addtarget("pacman") == -1) {
-						fprintf(stderr, _("error: pacman: %s\n"), alpm_strerror(pm_errno));
-						retval = 1;
-						goto cleanup;
-					}
-					break;
+					goto cleanup;
 				}
 			}
 		}
-- 
1.5.2.1