- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] updpkgsums: Allow checksums upgrade with root
by Sébastien Luttringer 07 Apr '13

07 Apr '13

Add --asroot into the makepkg call to allow package upgrade when running as root. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- contrib/updpkgsums.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index ffea96b..7456553 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -75,7 +75,7 @@ fi # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. - newsums=$(makepkg -g -p "$buildfile") && rm -f "$buildfile" && + newsums=$(makepkg --asroot -g -p "$buildfile") && rm -f "$buildfile" && exec awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { -- 1.8.2

3 4

[pacman-dev] [PATCH] Mark string as translatable
by Allan McRae 06 Apr '13

06 Apr '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 71d9d04..3fa2166 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -401,7 +401,7 @@ void cb_question(alpm_question_t event, void *data1, void *data2, strftime(created, 12, "%Y-%m-%d", localtime(&time)); if(key->revoked) { - revoked = " (revoked)"; + revoked = _(" (revoked)"); } *response = yesno(_("Import PGP key %d%c/%s, \"%s\", created: %s%s?"), -- 1.8.2

3 4

[pacman-dev] [PATCH] pacman: add -Qkk to usage() help
by Andrew Gregory 06 Apr '13

06 Apr '13

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 916873d..8a39e0a 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -139,7 +139,7 @@ static void usage(int op, const char * const myname) addlist(_(" -e, --explicit list packages explicitly installed [filter]\n")); addlist(_(" -g, --groups view all members of a package group\n")); addlist(_(" -i, --info view package information (-ii for backup files)\n")); - addlist(_(" -k, --check check that the files owned by the package(s) are present\n")); + addlist(_(" -k, --check check that package files exist (-kk for file properties)\n")); addlist(_(" -l, --list list the contents of the queried package\n")); addlist(_(" -m, --foreign list installed packages not found in sync db(s) [filter]\n")); addlist(_(" -n, --native list installed packages only found in sync db(s) [filter]\n")); -- 1.8.2

2 1

[pacman-dev] [PATCH] makepkg: avoid file|grep dependency for CRLF check
by Dave Reisner 06 Apr '13

06 Apr '13

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 73f45d4..a63b267 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2744,8 +2744,7 @@ if [[ ! -f $BUILDFILE ]]; then source_safe "$BUILDFILE" fi else - crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) - if [[ -n $crlftest ]]; then + if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" exit 1 fi -- 1.8.2

2 1

[pacman-dev] [PATCH] makepkg: remove extra ansi color codes
by Andrew Gregory 06 Apr '13

06 Apr '13

All those extra '\e[1;'s were just setting bold redundantly or immediately being cancelled. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index da620a4..7ba53b0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2636,20 +2636,20 @@ if [[ -t 2 && ! $USE_COLOR = "n" ]] && check_buildenv "color" "y"; then ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" GREEN="${BOLD}$(tput setaf 2)" RED="${BOLD}$(tput setaf 1)" YELLOW="${BOLD}$(tput setaf 3)" else - ALL_OFF="\e[1;0m" - BOLD="\e[1;1m" - BLUE="${BOLD}\e[1;34m" - GREEN="${BOLD}\e[1;32m" - RED="${BOLD}\e[1;31m" - YELLOW="${BOLD}\e[1;33m" + ALL_OFF="\e[0m" + BOLD="\e[1m" + BLUE="${BOLD}\e[34m" + GREEN="${BOLD}\e[32m" + RED="${BOLD}\e[31m" + YELLOW="${BOLD}\e[33m" fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW # override settings with an environment variable for batch processing BUILDDIR=${_BUILDDIR:-$BUILDDIR} BUILDDIR=${BUILDDIR:-$startdir} #default to $startdir if undefined -- 1.8.2

2 1

[pacman-dev] [PATCH] contrib: Use sysconfdir instead of /etc
by William Giokas 06 Apr '13

06 Apr '13

Don't force people to see /etc. Signed-off-by: William Giokas <1007380(a)gmail.com> --- contrib/zsh_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..c6e884f 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -472,8 +472,8 @@ _key_longopts=( ) _pacman_key_options=( - '--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files' - '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/' + '--config[Use an alternate config file (instead of @sysconfdir@/pacman.conf)]: :_files' + '--gpgdir[Set an alternate directory for GnuPG (instead of @sysconfdir@/pacman.d/gnupg)]: :_files -/' '--keyserver[Specify a keyserver to use if necessary]' ) @@ -579,7 +579,7 @@ _makepkg_longopts=( '--allsource[Generate a source-only tarball including downloaded source]' '--asroot[Allow makepkg to run as root user]' '--check[Run check() function in the PKGBUILD]' - '--config[Use an alternate config file instead of '/etc/makepkg.conf']: :_files' + '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files' '--holdver[Prevent automatic version bumping for development PKGBUILDs]' '--key[Specify key to use for gpg signing instead of the default]: :_keys' '--nocheck[Do not run the check() function in the PKGBUILD]' -- 1.8.2.282.ga32a0c2

2 1

[pacman-dev] [PATCH] updpkgsums: Add --clean to makepkg call
by Sébastien Luttringer 06 Apr '13

06 Apr '13

Avoid makepkg to let src/ directory after updating the sums Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- contrib/updpkgsums.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/updpkgsums.sh.in b/contrib/updpkgsums.sh.in index 7456553..cf3ce6a 100644 --- a/contrib/updpkgsums.sh.in +++ b/contrib/updpkgsums.sh.in @@ -75,7 +75,7 @@ fi # Generate the new sums and try to unlink the file before writing stdin back # into it. This final precaution shouldn't fail based on the previous checks, # but it's better to be extra careful before unlinking files. - newsums=$(makepkg --asroot -g -p "$buildfile") && rm -f "$buildfile" && + newsums=$(makepkg --asroot --clean -g -p "$buildfile") && rm -f "$buildfile" && exec awk -v newsums="$newsums" ' /^[[:blank:]]*(md|sha)[[:digit:]]+sums=/,/\)[[:blank:]]*(#.*)?$/ { if (!w) { -- 1.8.2

4 5

[pacman-dev] [PATCH] zsh completion: make sure -Ss works
by Daniel Wallace 06 Apr '13

06 Apr '13

if you put a type in pacman -Ss <regex> it doesn't work because it never passes through they pointer ->sync_search to set $state. All of the other iterations like this have a case, add one for -S*s* --- contrib/zsh_completion.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d1106..9edcdfa 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -202,7 +202,7 @@ _pacman_action_sync() { _arguments -s : \ {\*-c,\*--clean}'[Remove old packages from cache]' \ "$_pacman_opts_common[@]" \ - "$_pacman_opts_sync_modifiers[@]" \ + "$_pacman_opts_sync_modifiers[@]" ;; sync_group) _arguments -s : \ @@ -383,6 +383,12 @@ _pacman_zsh_comp() { "$_pacman_opts_sync_modifiers[@]" \ '*:package group:_pacman_completions_all_groups' ;; + S*s*) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:search text: ' + ;; S*) _pacman_action_sync ;; -- 1.8.2

2 1

[pacman-dev] [PATCH] ctypes.h shouldn't be included twice
by Simon Gomizelj 06 Apr '13

06 Apr '13

Earnestly spotted this on #archlinux. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/pacman.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 916873d..36244a0 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -24,7 +24,6 @@ #define PACKAGE_VERSION GIT_VERSION #endif -#include <ctype.h> /* isspace */ #include <stdlib.h> /* atoi */ #include <stdio.h> #include <ctype.h> /* isspace */ -- 1.8.2

2 1

[pacman-dev] [PATCH] doc: fix debug spelling mistake
by William Giokas 06 Apr '13

06 Apr '13

with -> when Signed-off-by: William Giokas <1007380(a)gmail.com> --- doc/makepkg.conf.5.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 0d1cf00..be5b809 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -182,7 +182,7 @@ Options *debug*;; Add the user-specified debug flags as specified in DEBUG_CFLAGS and DEBUG_CXXFLAGS to their counterpart buildflags. Creates a separate - package containing the debug symbols with used with `strip'. + package containing the debug symbols when used with `strip'. **INTEGRITY_CHECK=(**check1 ...**)**:: File integrity checks to use. Multiple checks may be specified; this -- 1.8.2.279.g631bc94

2 1