diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-27 11:54:52 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-27 11:54:52 -0600 |
| commit | 9fbb77c91ba411fa46b1f2955893e7a39291f46a (patch) | |
| tree | d756ecf61abf14f536cc000319e43a617fefe4da | |
| parent | 9bfbd739176ebc41e4ec93dcd21264b87640aa5b (diff) | |
| parent | 0775c38e72c06b9ad428c4e6dbfd0b6f0cda2818 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | doc/makepkg.8.txt | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | src/pacman/sync.c | 9 |
3 files changed, 5 insertions, 8 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 8f166a55..f3f5d7c9 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -73,7 +73,7 @@ Options default to the current directory. This allows the built package to be overwritten. -*-forcever*:: +*--forcever*:: This is a hidden option that should *not* be used unless you really know what you are doing. makepkg uses this internally when calling itself to set the new development pkgver of the package. diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 998e240c..f5d5e052 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1007,7 +1007,7 @@ devel_check() { newpkgver=$(date +%Y%m%d) elif [ ! -z ${_svntrunk} ] && [ ! -z ${_svnmod} ] ; then msg "$(gettext "Determining latest svn revision...")" - newpkgver=$(svn log $_svntrunk --limit 1 | sed -n 's/^r\([^ ]*\) .*$/\1/p') + newpkgver=$(svn log $_svntrunk --limit 1 -q | sed -n 's/^r\([0-9]*\) .*$/\1/p') elif [ ! -z ${_bzrtrunk} ] && [ ! -z ${_bzrmod} ] ; then msg "$(gettext "Determining latest bzr revision...")" newpkgver=$(bzr revno ${_bzrtrunk}) 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()); |