- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Use C locale when parsing UseDelta floating point values
by Dan McGee 11 Mar '13

11 Mar '13

We should save the current locale, use the 'C' locale during parsing, then restore the original locale. Config files should always parse regardless of the current user's locale setting. Fixes FS#34253. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/conf.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..3f1b1c3 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -21,6 +21,7 @@ #include <errno.h> #include <glob.h> #include <limits.h> +#include <locale.h> /* setlocale */ #include <fcntl.h> /* open */ #include <stdlib.h> #include <stdio.h> @@ -514,7 +515,15 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "UseDelta") == 0) { double ratio; char *endptr; + const char *oldlocale; + + /* set the locale to 'C' for consistant decimal parsing (0.7 and never + * 0,7) from config files, then restore old setting when we are done */ + oldlocale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); ratio = strtod(value, &endptr); + setlocale(LC_NUMERIC, oldlocale); + if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: invalid value for '%s' : '%s'\n"), -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Use C locale for parsing Delta value
by Allan McRae 11 Mar '13

11 Mar '13

Locales that use "," as their decimal separator resulted in parsing issues with the Delta value. Ensure the C locale is used during parsing. Fixes FS#34253 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 815df95..71bfed6 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -22,6 +22,7 @@ #include <glob.h> #include <limits.h> #include <fcntl.h> /* open */ +#include <locale.h> #include <stdlib.h> #include <stdio.h> #include <string.h> /* strdup */ @@ -514,7 +515,9 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "UseDelta") == 0) { double ratio; char *endptr; + setlocale(LC_NUMERIC, "C"); ratio = strtod(value, &endptr); + setlocale(LC_NUMERIC, ""); if(*endptr != '\0' || ratio < 0.0 || ratio > 2.0) { pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: invalid value for '%s' : '%s'\n"), -- 1.8.1.5

1 0

[pacman-dev] [translation] pacman-4.1
by Allan McRae 10 Mar '13

10 Mar '13

Hi translators, I have pushed the updated translation files to Transifex for the pacman-4.1 release. I aim to make the release before the end of the month, so it would be great if translations could be finished in the next two weeks. There are a few bugs about translations that I will outline: FS#22575, FS#30474 [de, pt, ALL] pacman -Qi and pacman -Si output are not well aligned in many languages. We will try to do something about that in the next release but it would be good to try and align these if possible FS#28857, FS#30740 [fi] Do not use positional parameters (e.g. %2$d) in the "pacman scripts" section as bash does not deal with these FS#29405 [pt, ALL] Do not translate pacman options like "--config". Notes about mistranslations for specific languages: Czech - https://bugs.archlinux.org/task/33953 Spanish - https://bugs.archlinux.org/task/33732 German - https://bugs.archlinux.org/task/31475 Thanks, Allan

3 3

[pacman-dev] [PATCH] alpm/remove.c: add newlines to debug output
by Andrew Gregory 10 Mar '13

10 Mar '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/remove.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0642e04..d0cd613 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -278,7 +278,7 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, struct stat dir_stbuf; if(stat(directory, &dir_stbuf) < 0) { _alpm_log(handle, ALPM_LOG_DEBUG, - "failed to stat directory %s: %s", + "failed to stat directory %s: %s\n", directory, strerror(errno)); return 0; } @@ -290,7 +290,7 @@ static int dir_is_mountpoint(alpm_handle_t *handle, const char *directory, snprintf(parent_dir, PATH_MAX, "%s..", directory); if(stat(parent_dir, &parent_stbuf) < 0) { _alpm_log(handle, ALPM_LOG_DEBUG, - "failed to stat parent of %s: %s: %s", + "failed to stat parent of %s: %s: %s\n", directory, parent_dir, strerror(errno)); return 0; } -- 1.8.1.5

1 0

[pacman-dev] [PATCH] Make VCS download functions print correct filename
by Neer Sighted 10 Mar '13

10 Mar '13

I've made the VCS download functions print the correct filename for their clone, as opposed to the last fragment in the url. --- scripts/makepkg.sh.in | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..0facb5e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -456,9 +456,7 @@ download_git() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} - repo=${repo%%.git*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") url=${url##*git+} @@ -536,8 +534,7 @@ download_hg() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") url=${url##*hg+} @@ -596,8 +593,7 @@ download_svn() { local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" - local repo=${netfile##*/} - repo=${repo%%#*} + local repo=$(get_filename "$netfile") local url=$(get_url "$netfile") if [[ $url != svn+ssh* ]]; then -- 1.8.1.4

3 11

[pacman-dev] [PATCH] pkgdelta: fix improper passing of file argument
by Dave Reisner 10 Mar '13

10 Mar '13

Looks like I hosed this pretty hard in 5a5e712c749edb8. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/pkgdelta.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index a6aad3f..39046b8 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -75,6 +75,7 @@ isnumeric() { } read_pkginfo() { + unset pkgver pkgname arch while IFS='=' read -r field value; do # skip comments and invalid lines [[ $field = '#'* || -z $value ]] && continue @@ -82,10 +83,10 @@ read_pkginfo() { # skip lines which aren't fields we care about [[ $field != @(pkgver|pkgname|arch) ]] || continue - declare "$field=$value" + declare -g "${field% }=${value# }" [[ $pkgname && $pkgver && $arch ]] && return 0 - done + done < <(bsdtar -xOqf "$1" .PKGINFO 2>/dev/null) error "$(gettext "Invalid package file '%s'.")" "$1" return 1 -- 1.8.1.5

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-7-g1e21aa5
by allan＠archlinux.org 10 Mar '13

10 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 1e21aa589d66c56db1c37078c3f1f6ed4095487b (commit) via 0cb963df037fe6fe397d565e9d9d524ce445fe61 (commit) via c5652361fb55f247acbc044c239beb05c3efd70d (commit) via 1366da57fa0257350fca58e3735e4ae558f3057f (commit) via 6a85e4a9ca5ac1c28259dfc01404199d592ad74b (commit) from b878157c782b63bbb452955e377d3824694947b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1e21aa589d66c56db1c37078c3f1f6ed4095487b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 13:07:16 2013 +1000 Update all translations files to push to Transifex Run update-po and fix the few errors reported. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0cb963df037fe6fe397d565e9d9d524ce445fe61 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 12:59:19 2013 +1000 Remove all leading :: from pacman translations Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c5652361fb55f247acbc044c239beb05c3efd70d Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 12:56:55 2013 +1000 Pull updated translations from transifex Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1366da57fa0257350fca58e3735e4ae558f3057f Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 12:52:36 2013 +1000 Add new languages from Transifex Languages: eo, nl, hr, ko, ja, fa, ar, sl, gl, id Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6a85e4a9ca5ac1c28259dfc01404199d592ad74b Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 12:20:31 2013 +1000 update transifex config Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .tx/config | 2 +- lib/libalpm/po/LINGUAS | 10 + lib/libalpm/po/{libalpm.pot => ar.po} | 85 +- lib/libalpm/po/ca.po | 90 +- lib/libalpm/po/cs.po | 86 +- lib/libalpm/po/da.po | 86 +- lib/libalpm/po/de.po | 90 +- lib/libalpm/po/el.po | 86 +- lib/libalpm/po/en_GB.po | 87 +- lib/libalpm/po/{libalpm.pot => eo.po} | 79 +- lib/libalpm/po/es.po | 92 +- lib/libalpm/po/{libalpm.pot => fa.po} | 81 +- lib/libalpm/po/fi.po | 86 +- lib/libalpm/po/fr.po | 116 ++- lib/libalpm/po/{es.po => gl.po} | 364 ++++---- lib/libalpm/po/{libalpm.pot => hr.po} | 221 +++-- lib/libalpm/po/hu.po | 88 +- lib/libalpm/po/{libalpm.pot => id.po} | 79 +- lib/libalpm/po/it.po | 88 +- lib/libalpm/po/ja.po | 618 ++++++++++++++ lib/libalpm/po/kk.po | 86 +- lib/libalpm/po/ko.po | 619 ++++++++++++++ lib/libalpm/po/libalpm.pot | 66 +- lib/libalpm/po/lt.po | 88 +- lib/libalpm/po/nb.po | 86 +- lib/libalpm/po/{tr.po => nl.po} | 367 ++++---- lib/libalpm/po/pl.po | 88 +- lib/libalpm/po/pt.po | 86 +- lib/libalpm/po/pt_BR.po | 88 +- lib/libalpm/po/ro.po | 86 +- lib/libalpm/po/ru.po | 86 +- lib/libalpm/po/sk.po | 88 +- lib/libalpm/po/{libalpm.pot => sl.po} | 153 ++-- lib/libalpm/po/sr.po | 97 ++- lib/libalpm/po/sr(a)latin.po | 97 ++- lib/libalpm/po/sv.po | 86 +- lib/libalpm/po/tr.po | 86 +- lib/libalpm/po/uk.po | 96 ++- lib/libalpm/po/zh_CN.po | 86 +- lib/libalpm/po/zh_TW.po | 177 ++-- scripts/po/LINGUAS | 10 + scripts/po/{pacman-scripts.pot => ar.po} | 342 +++++--- scripts/po/ca.po | 552 ++++++++---- scripts/po/cs.po | 569 +++++++++---- scripts/po/da.po | 554 ++++++++---- scripts/po/de.po | 571 +++++++++---- scripts/po/el.po | 562 ++++++++---- scripts/po/en_GB.po | 725 ++++++++++------ scripts/po/{pacman-scripts.pot => eo.po} | 339 +++++--- scripts/po/es.po | 555 ++++++++---- scripts/po/{pacman-scripts.pot => fa.po} | 341 +++++--- scripts/po/fi.po | 569 +++++++++---- scripts/po/fr.po | 735 ++++++++++------ scripts/po/{pacman-scripts.pot => gl.po} | 339 +++++--- scripts/po/{pacman-scripts.pot => hr.po} | 515 ++++++----- scripts/po/hu.po | 557 ++++++++---- scripts/po/{pacman-scripts.pot => id.po} | 341 +++++--- scripts/po/it.po | 561 ++++++++---- scripts/po/ja.po | 1369 ++++++++++++++++++++++++++++++ scripts/po/kk.po | 441 +++++++--- scripts/po/{pacman-scripts.pot => ko.po} | 398 ++++++--- scripts/po/lt.po | 551 ++++++++---- scripts/po/nb.po | 544 ++++++++---- scripts/po/{pacman-scripts.pot => nl.po} | 341 +++++--- scripts/po/pacman-scripts.pot | 326 ++++--- scripts/po/pl.po | 504 +++++++---- scripts/po/pt.po | 559 ++++++++---- scripts/po/pt_BR.po | 558 ++++++++---- scripts/po/ro.po | 555 ++++++++---- scripts/po/ru.po | 650 +++++++++----- scripts/po/sk.po | 542 ++++++++---- scripts/po/{pacman-scripts.pot => sl.po} | 455 ++++++---- scripts/po/sr.po | 539 ++++++++---- scripts/po/sr(a)latin.po | 539 ++++++++---- scripts/po/sv.po | 448 +++++++--- scripts/po/tr.po | 549 ++++++++---- scripts/po/uk.po | 552 ++++++++---- scripts/po/zh_CN.po | 530 ++++++++---- scripts/po/zh_TW.po | 351 +++++--- src/pacman/po/LINGUAS | 10 + src/pacman/po/{pacman.pot => ar.po} | 593 +++++++------ src/pacman/po/ca.po | 338 +++++--- src/pacman/po/cs.po | 362 +++++--- src/pacman/po/da.po | 349 +++++--- src/pacman/po/de.po | 348 +++++--- src/pacman/po/el.po | 336 +++++--- src/pacman/po/en_GB.po | 339 +++++--- src/pacman/po/{pacman.pot => eo.po} | 459 +++++----- src/pacman/po/es.po | 356 +++++--- src/pacman/po/{pacman.pot => fa.po} | 387 +++++---- src/pacman/po/fi.po | 349 +++++--- src/pacman/po/fr.po | 399 +++++---- src/pacman/po/{pacman.pot => gl.po} | 694 +++++++++------ src/pacman/po/{pacman.pot => hr.po} | 651 +++++++++----- src/pacman/po/hu.po | 337 +++++--- src/pacman/po/{pacman.pot => id.po} | 242 ++++-- src/pacman/po/it.po | 345 +++++--- src/pacman/po/ja.po | 1301 ++++++++++++++++++++++++++++ src/pacman/po/kk.po | 294 ++++--- src/pacman/po/{pacman.pot => ko.po} | 259 +++--- src/pacman/po/lt.po | 348 +++++--- src/pacman/po/nb.po | 341 +++++--- src/pacman/po/{pacman.pot => nl.po} | 242 ++++-- src/pacman/po/pacman.pot | 226 +++-- src/pacman/po/pl.po | 358 +++++--- src/pacman/po/pt.po | 342 +++++--- src/pacman/po/pt_BR.po | 357 +++++--- src/pacman/po/ro.po | 346 +++++--- src/pacman/po/ru.po | 346 +++++--- src/pacman/po/sk.po | 338 +++++--- src/pacman/po/{pacman.pot => sl.po} | 688 +++++++++------ src/pacman/po/sr.po | 366 +++++--- src/pacman/po/sr(a)latin.po | 366 +++++--- src/pacman/po/sv.po | 340 +++++--- src/pacman/po/tr.po | 336 +++++--- src/pacman/po/uk.po | 396 +++++---- src/pacman/po/zh_CN.po | 333 +++++--- src/pacman/po/zh_TW.po | 536 +++++++----- 118 files changed, 28146 insertions(+), 12491 deletions(-) copy lib/libalpm/po/{libalpm.pot => ar.po} (88%) copy lib/libalpm/po/{libalpm.pot => eo.po} (90%) copy lib/libalpm/po/{libalpm.pot => fa.po} (89%) copy lib/libalpm/po/{es.po => gl.po} (50%) copy lib/libalpm/po/{libalpm.pot => hr.po} (64%) copy lib/libalpm/po/{libalpm.pot => id.po} (90%) create mode 100644 lib/libalpm/po/ja.po create mode 100644 lib/libalpm/po/ko.po copy lib/libalpm/po/{tr.po => nl.po} (51%) copy lib/libalpm/po/{libalpm.pot => sl.po} (75%) copy scripts/po/{pacman-scripts.pot => ar.po} (81%) copy scripts/po/{pacman-scripts.pot => eo.po} (82%) copy scripts/po/{pacman-scripts.pot => fa.po} (82%) copy scripts/po/{pacman-scripts.pot => gl.po} (82%) copy scripts/po/{pacman-scripts.pot => hr.po} (69%) copy scripts/po/{pacman-scripts.pot => id.po} (82%) create mode 100644 scripts/po/ja.po copy scripts/po/{pacman-scripts.pot => ko.po} (78%) copy scripts/po/{pacman-scripts.pot => nl.po} (82%) copy scripts/po/{pacman-scripts.pot => sl.po} (72%) copy src/pacman/po/{pacman.pot => ar.po} (58%) copy src/pacman/po/{pacman.pot => eo.po} (72%) copy src/pacman/po/{pacman.pot => fa.po} (71%) copy src/pacman/po/{pacman.pot => gl.po} (50%) copy src/pacman/po/{pacman.pot => hr.po} (57%) copy src/pacman/po/{pacman.pot => id.po} (86%) create mode 100644 src/pacman/po/ja.po copy src/pacman/po/{pacman.pot => ko.po} (85%) copy src/pacman/po/{pacman.pot => nl.po} (86%) copy src/pacman/po/{pacman.pot => sl.po} (53%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] pacman-4.1 TODO
by Allan McRae 10 Mar '13

10 Mar '13

Things I have noticed that need done before pacman-4.1: - Translations - I will organise these soon... - Update bash completion "--color" (more?) - check "man pacman.conf" - formating looks off in the "Package and Database Signature Checking" section - update NEWS/README - Add LocalFileSigLevel/RemoteFileSigLevel in etc/pacman.conf - Add new compression defaults (lrzip etc) in etc/makepkg.conf Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.0rc1-2-gb878157
by allan＠archlinux.org 10 Mar '13

10 Mar '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via b878157c782b63bbb452955e377d3824694947b6 (commit) via f9be4eed42d50ccab59a116ad1a46af6a3c560a6 (commit) from 312e9252f4f74e26ad899950fbcb527d31760519 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b878157c782b63bbb452955e377d3824694947b6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 11:22:04 2013 +1000 fix distribution of contrib files Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f9be4eed42d50ccab59a116ad1a46af6a3c560a6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 10 11:12:43 2013 +1000 distribute library/term_colors.sh Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/Makefile.am | 2 +- scripts/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] fix distribution of contrib files
by Allan McRae 10 Mar '13

10 Mar '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 3641a08..64f476c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = \ pacscripts.sh.in \ pacsearch.in \ pacsysclean.sh.in \ - rankmirrors.sh.in + rankmirrors.sh.in \ updpkgsums.sh.in \ vimprojects \ zsh_completion.in \ -- 1.8.1.5

1 0