From 0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 27 Jan 2008 15:59:35 +0100 Subject: Clarify the "cancel current operation" message. Fixes FS#9295. Signed-off-by: Chantry Xavier [Dan: 'new pacman' -> 'new pacman version'] Signed-off-by: Dan McGee --- src/pacman/sync.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index c641dfec..582192a4 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -526,12 +526,9 @@ static int sync_trans(alpm_list_t *targets, int sync_only) * an '-S pacman' operation */ if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { printf("\n"); - printf(_(":: pacman has detected a newer version of itself.\n" - ":: It is recommended that you upgrade pacman by itself\n" - ":: using 'pacman -S pacman', and then rerun the current\n" - ":: operation. If you wish to continue the operation and\n" - ":: not upgrade pacman separately, answer no.\n")); - if(yesno(_(":: Cancel current operation? [Y/n] "))) { + printf(_(":: pacman has detected a newer version of itself.\n")); + if(yesno(_(":: Do you want to cancel the current operation\n" + ":: and install the new pacman version now? [Y/n] "))) { if(alpm_trans_release() == -1) { fprintf(stderr, _("error: failed to release transaction (%s)\n"), alpm_strerrorlast()); -- cgit v1.2.3-24-g4f1b