- Pacman-dev - lists.archlinux.org

[pacman-dev] pacman PKGBUILD needs depends=(python)
by Andrew Fyfe 02 Apr '07

02 Apr '07

Just installed arch to do some testing, went to run rankmirros as pacman suggests and no python, ooops. Python needs added to the depends list for pacman3. Andrew

7 9

[pacman-dev] [PATCH] Gettext support in abs
by Giovanni Scafora 02 Apr '07

02 Apr '07

Add gettext support to abs Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> diff --git a/scripts/abs b/scripts/abs index 2ec4322..af01cd5 100755 --- a/scripts/abs +++ b/scripts/abs @@ -1,5 +1,13 @@ #!/bin/bash +# gettext initialization" +source gettext.sh + +TEXTDOMAIN=abs +export TEXTDOMAIN +TEXTDOMAINDIR='@localedir@' +export TEXTDOMAINDIR + CONFDIR="/etc/abs" CONNMODE="m" @@ -9,14 +17,15 @@ CONNMODE="m" [ -f ~/.abs.conf ] && source ~/.abs.conf usage() { - echo "Arch Build System -- synchronization utility" - echo "usage: $0 [-p] [repository1 [repository2 ...]]" + echo "$(gettext "Arch Build System -- synchronization utility")" + abs=$0 + echo "$(eval_gettext "usage: \$abs [-p] [repository1 [repository2 ...]]")" echo - echo "abs will synchronize PKGBUILD scripts from the CVS repository" - echo "into $ABSROOT. You can follow different package trees by" - echo "editing /etc/abs/supfile.* files. If no argument is given, abs " - echo "will synchronize from supfiles specified in /etc/abs/abs.conf." - echo "If -p is specified, the connection is opened in passive mode." + echo "$(gettext "abs will synchronize PKGBUILD scripts from the CVS repository")" + echo "$(eval_gettext "into \$ABSROOT. You can follow different package trees by")" + echo "$(gettext "editing /etc/abs/supfile.* files. If no argument is given, abs ")" + echo "$(gettext "will synchronize from supfiles specified in /etc/abs/abs.conf.")" + echo "$(gettext "If -p is specified, the connection is opened in passive mode.")" } update() { @@ -43,11 +52,11 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then fi if [ ! -d "$ABSROOT" ]; then - echo "abs: $ABSROOT does not exist (or is not a directory)" + echo "$(eval_gettext "abs: \$ABSROOT does not exist (or is not a directory)")" exit 1 fi if [ ! -w "$ABSROOT" ]; then - echo "abs: no write permissions in $ABSROOT" + echo "$(eval_gettext "abs: no write permissions in \$ABSROOT")" exit 1 fi @@ -56,7 +65,7 @@ if [ "$(type -p cvsup)" ]; then elif [ "$(type -p csup)" ]; then CVSUP="csup" else - echo "abs: missing CVS synchronization utility. Install cvsup or csup." + echo "$(gettext "abs: missing CVS synchronization utility. Install cvsup or csup.")" exit 1 fi -- 1.5.0.6 -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] [patch] Cleanup makepkg.conf options and loading of makepkg.conf.
by Andrew Fyfe 02 Apr '07

02 Apr '07

Moved the following vars in /etc/makepkg.conf * BUILDSCRIPT * PKGEXT * DB_COMPRESSION * DB_CHECKSUMS Cleaned up sourcing of /etc/makepkg.conf in scripts and source ~/.makepkg.conf if it exists. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 12 ++++++++++++ scripts/gensync | 11 +++++++---- scripts/makepkg | 23 +++++++++++------------ scripts/repo-add | 11 ++++++++--- scripts/repo-remove | 11 ++++++++--- scripts/updatesync | 11 +++++++---- 6 files changed, 53 insertions(+), 26 deletions(-) Andrew >From f8dde814bd2137659dfca730d2c5a53dc612acd9 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu, 29 Mar 2007 12:41:47 +0100 Subject: [PATCH 2/2] Cleanup makepkg.conf options and loading of makepkg.conf. Moved the following vars in /etc/makepkg.conf * BUILDSCRIPT * PKGEXT * DB_COMPRESSION * DB_CHECKSUMS Cleaned up sourcing of /etc/makepkg.conf in scripts and source ~/.makepkg.conf if it exists. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- etc/makepkg.conf.in | 12 ++++++++++++ scripts/gensync | 11 +++++++---- scripts/makepkg | 23 +++++++++++------------ scripts/repo-add | 11 ++++++++--- scripts/repo-remove | 11 ++++++++--- scripts/updatesync | 11 +++++++---- 6 files changed, 53 insertions(+), 26 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 9ac0ef2..6f9e977 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -75,4 +75,16 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc}) #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john(a)doe.com>" +######################################################################### +# BUILDSCRIPT/EXTENSION DEFAULTS +######################################################################### +# +# WARNING: Do NOT modify these variables unless you know what you are +# doing. +# +BUILDSCRIPT="PKGBUILD" +PKGEXT=".pkg.tar.gz" +DB_COMPRESSION="gz" +DB_CHECKSUMS=(md5) + # vim: set ft=sh ts=2 sw=2 et: diff --git a/scripts/gensync b/scripts/gensync index 5a3dab8..7ebf3f0 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -45,10 +45,13 @@ usage() { exit 0 } -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source /etc/makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf error () { echo "==> ERROR: $*" >&2 diff --git a/scripts/makepkg b/scripts/makepkg index 92d8ab2..0739204 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -28,11 +28,12 @@ myver='3.0.0' startdir=$(pwd) -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source "/etc/abs/abs.conf" -SRCROOT="$ABSROOT" +# Only use ABSROOT if we haven't been passed a SRCROOT on the command line. +if [ -z "$SRCROOT" ]; then + [ -r "/etc/abs/abs.conf" ] && source /etc/abs/abs.conf + [ -r "~/.abs.conf" ] && source ~/.abs.conf + SRCROOT="$ABSROOT" +fi # Options CLEANUP=0 @@ -409,18 +410,16 @@ ARGLIST=$@ _PKGDEST=${PKGDEST} _SRCDEST=${SRCDEST} -#Source makepkg.conf; fail if it is not found -if [ -f /etc/makepkg.conf ]; then +# Source makepkg.conf; fail if it is not found +if [ -r /etc/makepkg.conf ]; then source /etc/makepkg.conf else error "/etc/makepkg.conf not found. cannot continue" - exit 1 + exit 1 # $E_CONFIG_ERROR # TODO: error codes fi -#Source user-specific makepkg.conf overrides -if [ -f ~/.makepkg.conf ]; then - source ~/.makepkg.conf -fi +# Source user-specific makepkg.conf overrides +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf # override settings with an environment variable for batch processing PKGDEST=${_PKGDEST:-$PKGDEST} diff --git a/scripts/repo-add b/scripts/repo-add index d6e2c5a..213d068 100755 --- a/scripts/repo-add +++ b/scripts/repo-add @@ -23,11 +23,16 @@ myver='3.0.0' FORCE=0 REPO_DB_FILE="" - -DB_COMPRESSION="gz" #TODO this is gross -DB_CHECKSUMS=(md5) TMP_DIR="" +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + # print usage instructions usage() { echo "repo-add $myver" diff --git a/scripts/repo-remove b/scripts/repo-remove index eeee240..0e8e46d 100755 --- a/scripts/repo-remove +++ b/scripts/repo-remove @@ -23,11 +23,16 @@ myver='3.0.0' FORCE=0 REPO_DB_FILE="" - -DB_COMPRESSION="gz" #TODO this is gross -DB_CHECKSUMS=(md5) TMP_DIR="" +if [ -r /etc/makepkg.conf ]; then + source /etc/makpkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error code +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf + # print usage instructions usage() { echo "repo-remove $myver" diff --git a/scripts/updatesync b/scripts/updatesync index a4a6847..09c8ca0 100755 --- a/scripts/updatesync +++ b/scripts/updatesync @@ -47,10 +47,13 @@ usage() { exit 0 } -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source /etc/makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi +[ -r ~/.makepkg.conf ] && source ~/.makepkg.conf error () { echo "==> ERROR: $*" >&2 -- 1.5.0.6

2 3

[pacman-dev] FS#4404 - rsync protocol support for makepkg.
by Andrew Fyfe 01 Apr '07

01 Apr '07

Rediffed post gettext changes. Andrew

1 3

[pacman-dev] makepkg: Reduced fakeroot usage patches
by Andrew Fyfe 01 Apr '07

01 Apr '07

Take 3 :p Fakeroot patches rediffed after the gettext changes were added. Andrew

1 9

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by Dan McGee 01 Apr '07

01 Apr '07

Date: Sunday, April 1, 2007 @ 13:05:17 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.22 -> 1.23) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.22 pacman-lib/src/pacman/po/it.po:1.23 --- pacman-lib/src/pacman/po/it.po:1.22 Sat Mar 24 00:18:18 2007 +++ pacman-lib/src/pacman/po/it.po Sun Apr 1 13:05:16 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Pacman package manager 3.0.0\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-03-23 20:46-0500\n" -"PO-Revision-Date: 2007-03-22 12:40+0100\n" +"POT-Creation-Date: 2007-03-31 03:37+0200\n" +"PO-Revision-Date: 2007-03-31 04:00+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -434,7 +434,7 @@ #: src/pacman/pacman.c:127 #, c-format msgid " required by any package\n" -msgstr " più richiesti da nessun pacchetto\n" +msgstr " ma non più richiesti da alcun pacchetto\n" #: src/pacman/pacman.c:128 src/pacman/pacman.c:143 #, c-format @@ -887,11 +887,6 @@ msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:557 -#, c-format -msgid "'%s': %s\n" -msgstr "'%s': %s\n" - #: src/pacman/sync.c:572 msgid ":: Install whole content? [Y/n] " msgstr ":: Installare l'intero contenuto? [Y/n] " @@ -1091,6 +1086,9 @@ msgid "Total Installed Size: %.2f MB\n" msgstr "Dimensione totale dei pacchetti installati: %.2f MB\n" +#~ msgid "'%s': %s\n" +#~ msgstr "'%s': %s\n" + #~ msgid "is required by" #~ msgstr "è richiesto da"

1 0

[pacman-dev] warning: current locale is invalid...
by Andrew Fyfe 31 Mar '07

31 Mar '07

src/pacman/pacman.c line 448 Any chance this error can be sent to stderr rather than stdout, it's screwing up scripts that read in pacman output. And more to the point is it just me or does this error always come up if LC_ALL|LANG!=C|POSIX Andrew

2 1

[pacman-dev] spanish translation
by Juan Pablo González T. 31 Mar '07

31 Mar '07

Hi. I'm working in a translation of pacman to my native language, the spanish. i already done and corrected the pacman.po, and right now i'm working on libalpm.po. both for the "es" locale the reason of this mail is the next question: how can i send you my work? thank you for your patience. greetings!! __________________________________________________ Correo Yahoo! Espacio para todos tus mensajes, antivirus y antispam ¡gratis! Regístrate ya - http://correo.espanol.yahoo.com/

3 3

[pacman-dev] some notes for -h and getopt
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! Some things I noticed after my previous buggy patch: 1. After -h there are [package], <package> and <file> in many places, however [packages], <packages> and <files> would be better in most cases, so you should check and correct these. 2. I misled you by suggesting "-s <regex>" to -h. This very informative; however to be more precise, [package] (which should be [packages], see 1.; or [packages|regexes], huh ?:-) {which is in the first line (after -Sh or -Qh)} is treated as regex and this should be somehow described in the description of -s. Sorry for misleading :-( 3. Only "op" parameters are mutual now. Of course in many cases the "sub" parameters of the "op" parameters are not mutual; but after "pacman -Qls foo" not defined what will happen. I don't really care about this (I don't really like getopt either; and users are expected to use switches after thinking .-), I just warn you, that this command line is accepted now: "pacman -y foo -l -Q -s foo2" and not defined what will happen (<-Note: -y is not allowed after -Q, but accepted because allowed after -S) Bye, Nagy Gabor

1 0

[pacman-dev] [patch] Very small bug(?)fix
by Nagy Gabor 31 Mar '07

31 Mar '07

Hi! I wanted to search packages with "-Ss -hu" and I found that -hu is treated as a new switch. So here is my little patch to set that --search requires an argument. (Anyway, I could search with .*-hu :-) -------------------- --- pacman-lib/src/pacman/pacman.c.old 2007-03-31 09:26:09.000000000 +0200 +++ pacman-lib/src/pacman/pacman.c 2007-03-31 09:33:39.000000000 +0200 @@ -247,7 +247,7 @@ {"print-uris", no_argument, 0, 'p'}, {"root", required_argument, 0, 'r'}, {"recursive", no_argument, 0, 's'}, - {"search", no_argument, 0, 's'}, + {"search", required_argument, 0, 's'}, {"upgrades", no_argument, 0, 'u'}, {"sysupgrade", no_argument, 0, 'u'}, {"verbose", no_argument, 0, 'v'}, @@ -266,7 +266,7 @@ struct stat st; unsigned short logmask; - while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepiuwyg", opts, &option_index))) { + while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhs:cVfmnoldepiuwyg", opts, &option_index))) { if(opt < 0) { break; } ----------------------- Bye, Nagy Gabor

1 1