moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

Clarify the "cancel current operation" message.

Browse Source 
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>
This commit is contained in:
Chantry Xavier 2008-01-27 15:59:35 +01:00 committed by Dan McGee
parent f950c26307
commit 0775c38e72
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pacman/sync.c
View File

@ -526,12 +526,9 @@ static int sync_trans(alpm_list_t *targets, int sync_only)
* an '-S pacman' operation */ * an '-S pacman' operation */
if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) { if(strcmp("pacman", alpm_pkg_get_name(spkg)) == 0) {
printf("\n"); printf("\n");
printf(_(":: pacman has detected a newer version of itself.\n" printf(_(":: pacman has detected a newer version of itself.\n"));
":: It is recommended that you upgrade pacman by itself\n" if(yesno(_(":: Do you want to cancel the current operation\n"
":: using 'pacman -S pacman', and then rerun the current\n" ":: and install the new pacman version now? [Y/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] "))) {
if(alpm_trans_release() == -1) { if(alpm_trans_release() == -1) {
fprintf(stderr, _("error: failed to release transaction (%s)\n"), fprintf(stderr, _("error: failed to release transaction (%s)\n"),
alpm_strerrorlast()); alpm_strerrorlast());