From 11692e0eef79e016859bb182917e56a12a14f734 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 24 Jan 2008 22:26:58 -0600 Subject: doc/makepkg.8: add missing '-' to manpage option Signed-off-by: Dan McGee --- doc/makepkg.8.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3-24-g4f1b From f950c2630798e03bbee314c4a3f2749d1293a2b3 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Sun, 27 Jan 2008 00:24:36 +0100 Subject: makepkg : improve determination of svn revision. The previous sed command matched every line starting with r. For example, with mpd-svn package in aur, the svn log output was rather big, and there were several lines starting with r (the actual revision : r7155, but also other lines starting with reverting and run), so this broke makepkg: > makepkg ==> Determining latest svn revision... -> Version found: 7155 everting un sed: -e expression #1, char 27: unterminated `s' command To make the sed command more bullet proof, I added the -q option of svn log, which produces a quieter output, without the log. And I changed the sed command to only match numbers for the revision. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}) -- cgit v1.2.3-24-g4f1b 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