diff options
| author | Chantry Xavier <shiningxc@gmail.com> | 2008-01-27 15:59:35 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-27 18:50:30 +0100 |
| commit | 0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818 (patch) | |
| tree | de4608e561e9fd7fbccd920c5171d9ec1c2cefd0 | |
| parent | f950c2630798e03bbee314c4a3f2749d1293a2b3 (diff) | |
| download | pacman-0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818.tar.gz pacman-0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818.tar.xz | |
Clarify the "cancel current operation" message.
Fixes FS#9295.
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
[Dan: 'new pacman' -> 'new pacman version']
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | src/pacman/sync.c | 9 |
1 files 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()); |