From b8ef22312b4e5fb6b44b39c290303b2b77a68ea9 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Fri, 18 Nov 2011 08:35:21 -0500 Subject: makepkg: trim trailing space from whitespace sensitive vars This applies to pkgver, pkgrel, and epoch and ensures that any trailing whitespace outside of the context of the variable declaration itself is properly trimmed. The Bash parser will ignore this, and so should we. We don't need to worry about leading space because it would force a syntax error, or fail validation. Signed-off-by: Dave Reisner Signed-off-by: Dan McGee --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 085fbb91..f39e9d1e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1441,7 +1441,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]:-]* ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1450,7 +1450,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]-]* ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 @@ -1459,7 +1459,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*epoch$/' "$BUILDFILE" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^\(['\''"]\)\(.*\)\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i != *([[:digit:]]) ]]; then error "$(gettext "%s must be an integer.")" "epoch" return 1 -- cgit v1.2.3-70-g09d2 From 507a2d15e65aba93a20ee99d90345917866407dc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 20 Nov 2011 21:27:28 -0600 Subject: Final changes before 4.0.1 release * Add last-minute changes to NEWS * Don't treat '_' or '_n' special in scripts when finding translatable strings; this breaks with one use of `read` and a dummy _ variable Signed-off-by: Dan McGee --- NEWS | 10 +++++++--- scripts/po/Makevars | 4 +--- src/pacman/po/zh_TW.po | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 097dbc4b..1b7729e2 100644 --- a/NEWS +++ b/NEWS @@ -6,13 +6,17 @@ VERSION DESCRIPTION - fix edge case in download progress bar rounding (FS#26853) - ensure downloads started as tempfiles have correct umask - ensure unowned symlinks are not overwritten incorrectly + - allow -U operation even without sync databases (FS#26899) - update libtool files and update fix for -Wl,-as-needed - fix build when using --disable-static (FS#26652) - pacman-key: add a keyserver timeout value in --init - repo-add: fix race condition around lock file removal - - makepkg: accept changelog= or install= without a value - - makepkg: handle PGP signatures with a .sign extension - - makepkg: delay attachment of signal traps (FS#26196) + - makepkg: + - accept changelog= or install= without a value + - trim trailing whitespace from sensitive variables + - handle PGP signatures with a .sign extension + - delay attachment of signal traps (FS#26196) + - translations: multiple updates and corrections 4.0.0 - well-integrated and powerful signed packages and databases support in pacman, the library, and scripts (FS#5331) - over 800 commits to pacman.git since 3.5.4 release diff --git a/scripts/po/Makevars b/scripts/po/Makevars index 178b4dc7..494da1d7 100644 --- a/scripts/po/Makevars +++ b/scripts/po/Makevars @@ -8,9 +8,7 @@ subdir = scripts/po top_builddir = ../../ # These options get passed to xgettext. -XGETTEXT_OPTIONS = --no-location \ - --keyword=_ --flag=_:1:c-format \ - --keyword=_n:1,2 --flag=_n:1:c-format --flag=_n:2:c-format +XGETTEXT_OPTIONS = --no-location # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding diff --git a/src/pacman/po/zh_TW.po b/src/pacman/po/zh_TW.po index 9a9472a9..ccda12e7 100644 --- a/src/pacman/po/zh_TW.po +++ b/src/pacman/po/zh_TW.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Dan McGee , 2011. # , 2011. msgid "" msgstr "" "Project-Id-Version: Arch Linux Pacman package manager\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "POT-Creation-Date: 2011-11-13 21:47-0600\n" -"PO-Revision-Date: 2011-11-14 03:57+0000\n" +"PO-Revision-Date: 2011-11-16 05:14+0000\n" "Last-Translator: toofishes \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.net/projects/p/" "archlinux-pacman/team/zh_TW/)\n" -- cgit v1.2.3-70-g09d2