summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-01-27 11:54:52 -0600
committerDan McGee <dan@archlinux.org>2008-01-27 11:54:52 -0600
commit9fbb77c91ba411fa46b1f2955893e7a39291f46a (patch)
treed756ecf61abf14f536cc000319e43a617fefe4da /src
parent9bfbd739176ebc41e4ec93dcd21264b87640aa5b (diff)
parent0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818 (diff)
downloadpacman-9fbb77c91ba411fa46b1f2955893e7a39291f46a.tar.xz
Merge branch 'maint'
Diffstat (limited to 'src')
-rw-r--r--src/pacman/sync.c9
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());