- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] contrib: fix typo in PKGBUILD.vim
by Allan McRae 08 Jun '12

08 Jun '12

FS#30156 Signed-off-by: Allan McRae <allan(a)archlinux.org> --- contrib/PKGBUILD.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 4d69e4d..ee1e45f 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -108,7 +108,7 @@ syn match pbValidOptdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbOptdependsGroup start=/^optdepends=(/ end=/)/ contains=pb_k_optdepends,pbValidOptdepends,shDoubleQuote,shSingleQuote " checkdepends -syn keyword pb_k_ckdepends ckdepends contained +syn keyword pb_k_ckdepends checkdepends contained syn match pbValidCkdepends /$[[:alnum:]]\|+\|-\|_$*/ contained syn region pbCkdependsGroup start=/^checkdepends=(/ end=/)/ contains=pb_k_ckdepends,pbValidCkdepends,shDoubleQuote,shSingleQuote -- 1.7.10.4

1 0

[pacman-dev] [PATCH] pacman: print version information in debug output
by Allan McRae 07 Jun '12

07 Jun '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/pacman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..6226ee1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -857,6 +857,8 @@ int main(int argc, char *argv[]) } } + pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.10.3

2 1

[pacman-dev] [PATCH] makepkg: add support for SVN urls
by Allan McRae 07 Jun '12

07 Jun '12

Allow SVN repo sources in the form: source=("<folder>::<repo>#<fragment>") where <repo> must start with svn (e.g svn+http://) and a <fragment> can specify a revision (e.g. revision=22). Signed-off-by: Allan McRae <allan(a)archlinux.org> --- If anyone knows stuff about CVS, Mercurial, Darcs or Bazaar and what fragments should be supported for them, let me know... scripts/makepkg.sh.in | 73 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 56f2871..8d20d44 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -196,7 +196,7 @@ get_filepath() { local proto="$(get_protocol "$1")" case $proto in - git*) + git*|svn*) if [[ -d "$startdir/$file" ]]; then file="$startdir/$file" elif [[ -d "$SRCDEST/$file" ]]; then @@ -437,6 +437,72 @@ download_git() { popd &>/dev/null } +download_svn() { + local netfile=$1 + + local fragment=${netfile##*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local folder=$(get_filepath "$netfile") + [[ -z "$folder" ]] && folder="$SRCDEST/$(get_filename "$netfile")" + + local repo=${netfile##*/} + repo=${repo%%#*} + + local url=$(get_url "$netfile") + if [[ $url != svn+ssh* ]]; then + url=${url##*svn+} + fi + url=${url%%#*} + + if [[ ! -d $folder ]]; then + msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "svn" + if ! svn checkout --config-dir $folder "$url" "$folder"; then + error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "svn" + plain "$(gettext "Aborting...")" + exit 1 + fi + else + msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "svn" + cd_safe "$folder" + if ! svn update; then + # only warn on failure to allow offline builds + warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" + fi + fi + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" + pushd "$srcdir" &>/dev/null + rm -rf ${folder##*/} + cp -a $folder . + + cd_safe ${folder##*/} + + if [[ -n $fragment ]]; then + case $fragment in + revision=*) + ref=${fragment##*=} + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if [[ -n $ref ]]; then + if ! svn up -r $ref; then + error "$(gettext "Failure while checking out reference %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + fi + fi + + popd &>/dev/null +} + download_sources() { msg "$(gettext "Retrieving Sources...")" @@ -456,6 +522,9 @@ download_sources() { git*) download_git "$netfile" ;; + svn*) + download_svn "$netfile" + ;; *) error "$(gettext "Unknown download protocol: %s")" "$proto" plain "$(gettext "Aborting...")" @@ -827,7 +896,7 @@ generate_checksums() { proto="$(get_protocol "$netfile")" case $proto in - git*) + git*|svn*) sum="SKIP" ;; *) -- 1.7.10.3

1 0

[pacman-dev] [PATCH] makepkg: install deps with --repackage
by Allan McRae 07 Jun '12

07 Jun '12

I have noticed that quite a number of packages fail with "makepkg -R" when their (make)dependencies are not installed. Adjust makepkg to check for dependencies when used with -R. This can still be avoided by using --nodeps/-d. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- 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 c055691..63cdd4d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2424,9 +2424,9 @@ if (( SOURCEONLY )); then exit 0 fi -if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then - # no warning message needed for nobuild, repkg - if (( NODEPS || ( REPKG && PKGFUNC ) )); then +if (( NODEPS || (NOBUILD && !DEP_BIN ) )); then + # no warning message needed for nobuild + if (( NODEPS )); then warning "$(gettext "Skipping dependency checks.")" fi elif type -p "${PACMAN%% *}" >/dev/null; then -- 1.7.10.3

1 0

[pacman-dev] [PATCH] pacman: print version information in debug output
by Allan McRae 07 Jun '12

07 Jun '12

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/po/ca.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/cs.po | 42 +++++++++++++++++++++++++++++++----------- scripts/po/da.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/de.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/el.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/es.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/fi.po | 45 ++++++++++++++++++++++++++++++++++----------- scripts/po/fr.po | 45 ++++++++++++++++++++++++++++++++++----------- src/pacman/pacman.c | 2 ++ 9 files changed, 271 insertions(+), 88 deletions(-) diff --git a/scripts/po/ca.po b/scripts/po/ca.po index 79e219a..f179d3e 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -8,7 +8,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-02-06 13:22+0000\n" "Last-Translator: Hector Mtz-Seara <hseara(a)gmail.com>\n" "Language-Team: Catalan (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -271,6 +271,9 @@ msgstr "%s no pot estar buit." msgid "%s is not allowed to start with a hyphen." msgstr "%s no pot començar amb un guionet." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s no pot contenir dos punts, guions o espais en blanc." @@ -826,18 +829,21 @@ msgstr "Dashabilitant claus revocades del clauer..." msgid "Disabling key %s..." msgstr "Deshabilitant clau %s..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "" "No s'ha pogut incorporar un arxiu de claus especificat al anell de claus " "gpg." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "No ha pogut esborrar una clau especificada del anell de claus gpg." msgid "The key identified by %s could not be edited." msgstr "No s'ha pogut editar la clau identificada per %s ." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "No s'ha pogut exportar una clau especificada del anell de claus gpg." msgid "The fingerprint of a specified key could not be determined." @@ -957,7 +963,8 @@ msgstr "S'està rotant la base de dades en l'emplaçament..." msgid "Finished. Your pacman database has been optimized." msgstr "Ha finalitzat. S'ha optimitzat la base de dades del pacman." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Ús: pkgdelta [q] <package1><package2>\\n" msgid "" @@ -970,6 +977,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Exemple: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Opcions:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet minimitza sortida\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -982,6 +1005,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Fitxer de paquet invàlid '%'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Els noms dels paquets no coincideixen: '%s' i '%s'" @@ -997,6 +1023,9 @@ msgstr "Generant delta de la versió %s a la versió %s" msgid "Delta could not be created." msgstr "No s'ha pogut generar delta." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Delta generada: '%s'" @@ -1017,9 +1046,6 @@ msgstr "" "arxiu paquet.\\nMultiples paquets poden ser afegits poden especificant-los " "en la línia de comandes.\\n" -msgid "Options:\\n" -msgstr "Opcions:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr "" " -d, --delta genera i afegeix delta per l'actualització del packet\\n" @@ -1045,9 +1071,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "No hi ha res a veure en aquest punt, si us plau continua.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet minimitza sortida\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr "" " -s, --sign signa la base de dades amb GnuPG després de " diff --git a/scripts/po/cs.po b/scripts/po/cs.po index 5bf0447..9b71bb8 100644 --- a/scripts/po/cs.po +++ b/scripts/po/cs.po @@ -11,7 +11,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-02-02 06:07+0000\n" "Last-Translator: Dan McGee <dpmcgee(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -270,6 +270,9 @@ msgstr "%s nemůže být prázdné." msgid "%s is not allowed to start with a hyphen." msgstr "%s nemůže začínat pomlčkou." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s nesmí obsahovat dvojtečky, pomlčky nebo mezery." @@ -778,16 +781,16 @@ msgstr "Rušení odvolaných klíčů v klíčence..." msgid "Disabling key %s..." msgstr "Rušení klíče %s..." -msgid "A specified keyfile could not be added to the gpg keychain." +msgid "A specified keyfile could not be added to the keyring." msgstr "" -msgid "A specified key could not be removed from the gpg keychain." +msgid "A specified key could not be removed from the keyring." msgstr "" msgid "The key identified by %s could not be edited." msgstr "" -msgid "A specified key could not be exported from the gpg keychain." +msgid "A specified key could not be exported from the keyring." msgstr "" msgid "The fingerprint of a specified key could not be determined." @@ -901,7 +904,8 @@ msgstr "Vyměňují se databáze..." msgid "Finished. Your pacman database has been optimized." msgstr "Dokončeno. Databáze pacmana byla optimalizována." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Použití: pkgdelta [-q] <balíček1><balíček2>\\n" msgid "" @@ -914,6 +918,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Příklad: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Volby:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet omezí výpisy\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -926,6 +946,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Neplatný soubor balíčku '%s'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Jména balíčků nesouhlasí: '%s' a '%s'" @@ -941,6 +964,9 @@ msgstr "Generuje se delta z verze %s na verzi %s" msgid "Delta could not be created." msgstr "Delta rozdíl nemohl být vytvořen." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Vygenerován delta rozdíl: '%s'" @@ -958,9 +984,6 @@ msgid "" "\\nMultiple packages to add can be specified on the command line.\\n" msgstr "" -msgid "Options:\\n" -msgstr "Volby:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr " -d, --delta vytvoří a přidá rozdíly (delta) pro update balíčků\\n" @@ -980,9 +1003,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet omezí výpisy\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr " -s, --sign po update podepíše databázi pomocí GnuPG\\n" diff --git a/scripts/po/da.po b/scripts/po/da.po index a654b1b..96cfa2f 100644 --- a/scripts/po/da.po +++ b/scripts/po/da.po @@ -8,7 +8,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-03-31 16:48+0000\n" "Last-Translator: jakobw <jakob.wadsager(a)gmail.com>\n" "Language-Team: Danish (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -267,6 +267,9 @@ msgstr "%s må ikke være tom." msgid "%s is not allowed to start with a hyphen." msgstr "%s må ikke starte med en bindestreg." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s må ikke indeholde koloner, bindestreger eller mellemrum." @@ -799,16 +802,19 @@ msgstr "Deaktiverer tilbagekaldte nøgler i nøglering..." msgid "Disabling key %s..." msgstr "Deaktiverer nøgle %s..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "En angivet nøglefil kunne ikke tilføjes til gpg-nøgleringen." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "En angivet nøgle kunne ikke fjernes fra gpg-nøgleringen." msgid "The key identified by %s could not be edited." msgstr "Nøglen identificeret ved %s kunne ikke redigeres." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "En angivet nøgle kunne ikke blive eksporteret fra gpg-nøgleringen." msgid "The fingerprint of a specified key could not be determined." @@ -923,7 +929,8 @@ msgstr "Roterer database på plads..." msgid "Finished. Your pacman database has been optimized." msgstr "Færdig. Din pacman-database er blevet optimeret." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Brug: pkgdelta [-q] <pakke1> <pakke2>\\n" msgid "" @@ -936,6 +943,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Eksempel: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Valgmuligheder:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet minimer uddata\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -948,6 +971,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Ugyldig pakkefil '%s'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Pakkenavnene er ikke ens: '%s' og '%s'" @@ -963,6 +989,9 @@ msgstr "Genererer delta fra version %s til version %s" msgid "Delta could not be created." msgstr "Delta kunne ikke oprettes." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Genereret delta : '%s'" @@ -982,9 +1011,6 @@ msgstr "" "repo-add opdaterer en pakkedatabase ved at læse en pakkefil. \\nFlere pakker " "kan tilføjes ved at angive disse på kommandolinien.\\n" -msgid "Options:\\n" -msgstr "Valgmuligheder:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr " -d, --delta generer og tilføj delta for pakkeopdatering\\n" @@ -1007,9 +1033,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Fortsæt venligst, der er ikke noget at se her.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet minimer uddata\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr " -s, --sign signer database med GnuPG efter opdatering\\n" diff --git a/scripts/po/de.po b/scripts/po/de.po index d1bd9ae..fc2015c 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -14,7 +14,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-03-29 10:22+0000\n" "Last-Translator: Matthias Gorissen <matthias(a)archlinux.de>\n" "Language-Team: German (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -276,6 +276,9 @@ msgstr "%s darf nicht leer sein." msgid "%s is not allowed to start with a hyphen." msgstr "%s darf nicht mit einem Bindestrich beginnen." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s darf keine Doppelpunkte, Bindestriche oder Leerzeichen enthalten." @@ -858,12 +861,14 @@ msgstr "Mache widerrufene Schlüssel im Schlüsselbund unbrauchbar ..." msgid "Disabling key %s..." msgstr "Mache Schlüssel %s unbrauchbar ..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "" "Eine spezifizierte Schlüsseldatei konnte nicht zum GPG-Schlüsselbund " "hinzugefügt werden." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "" "Ein spezifizierter Schlüssel konnte nicht vom GPG-Schlüsselbund entfernt " "werden." @@ -871,7 +876,8 @@ msgstr "" msgid "The key identified by %s could not be edited." msgstr "Der von %s identifizierte Schlüssel konnte nicht bearbeitet werden." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "" "Ein bestimmter Schlüssel konnte nicht vom GPG-Schlüsselbund exportiert " "werden." @@ -996,7 +1002,8 @@ msgstr "Verschiebe neue Datenbank an ihren Ort..." msgid "Finished. Your pacman database has been optimized." msgstr "Fertig. Ihre Pacman-Datenbank wurde optimiert." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Verwendung: pkgdelta [-q] <Paket1> <Paket2>\\n" msgid "" @@ -1010,6 +1017,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Beispiel: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Optionen:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet minimiere Ausgaben\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -1022,6 +1045,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Ungültige Paket-Datei '%s'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Die Paketnamen stimmen nicht überein: '%s' und '%s'" @@ -1037,6 +1063,9 @@ msgstr "Erstelle Delta von Version %s zu Version %s" msgid "Delta could not be created." msgstr "Delta konnte nicht erstellt werden." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Erstellte Delta: '%s'" @@ -1058,9 +1087,6 @@ msgstr "" "ausliest.\\nWenn mehrere Pakete hinzugefügt werden sollen, kann dies auf der " "Kommando-Zeile spezifiziert werden.\\n" -msgid "Options:\\n" -msgstr "Optionen:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr "" " -d, --delta erzeuge und füge Delta-Datei für Paket-Update hinzu" @@ -1085,9 +1111,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Bitte weiter gehen. Hier gibt es nichts zu sehen.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet minimiere Ausgaben\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr " -s, --sign signiere Datenbank mit GnuPG nach dem Update\\n" diff --git a/scripts/po/el.po b/scripts/po/el.po index 5a6dc88..b6ac674 100644 --- a/scripts/po/el.po +++ b/scripts/po/el.po @@ -9,7 +9,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-02-02 08:19+0000\n" "Last-Translator: Christos Nouskas <nous(a)archlinux.us>\n" "Language-Team: Greek (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -267,6 +267,9 @@ msgstr "Το %s δεν επιτρέπεται να είναι κενό." msgid "%s is not allowed to start with a hyphen." msgstr "Το %s δεν επιτρέπεται να ξεκινά με παύλα." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "Δεν επιτρέπεται η χρήση ερωτηματικού, παύλας ή διαστήματος στο %s." @@ -798,16 +801,19 @@ msgstr "Απενεργοποίηση ανακληθέντων κλειδιών msgid "Disabling key %s..." msgstr "Απενεργοποίηση κλειδιού %s..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "Αδυναμία προσθήκης αρχείου κλειδιών στην κλειδοθήκη gpg." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "Αδυναμία διαγραφής κλειδιού από την κλειδοθήκη gpg." msgid "The key identified by %s could not be edited." msgstr "Αδυναμία επεξεργασίας κλειδιού %s." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "Αδυναμία εξαγωγής κλειδιού από την κλειδοθήκη gpg." msgid "The fingerprint of a specified key could not be determined." @@ -923,7 +929,8 @@ msgstr "Μεταστροφή βάσης..." msgid "Finished. Your pacman database has been optimized." msgstr "Τέλος. Η βάση πακέτων του pacman βελτιστοποιήθηκε." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Χρήση: pkgdelta [-q] <πακέτο1> <πακέτο2>\\n" msgid "" @@ -936,6 +943,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Παράδειγμα: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Επιλογές:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet περιστολή πληροφορίας\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -949,6 +972,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Άκυρο όνομα πακέτου '%s'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Τα ονόματα των πακέτων δεν ταιριάζουν: '%s' και '%s'" @@ -964,6 +990,9 @@ msgstr "Δημιουργία delta από έκδοση %s σε %s" msgid "Delta could not be created." msgstr "Αδυναμία δημιουργίας delta." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Δημιουργία delta: '%s'" @@ -983,9 +1012,6 @@ msgstr "" "Το repo-add ενημερώνει μια βάση διαβάζοντας ένα αρχείο πακέτου.\\nΜπορούν να " "καθορισθούν στην γραμμή εντολών πολλαπλά πακέτα προς προσθήκη.\\n" -msgid "Options:\\n" -msgstr "Επιλογές:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr "" " -d, --delta παραγωγή και προσθήκη delta για αναβάθμιση πακέτου\\n" @@ -1008,9 +1034,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Συνέχισε παρακάτω, δεν υπάρχει τίποτε να δεις εδώ.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet περιστολή πληροφορίας\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr " -s, --sign υπογραφή βάσης με GnuPG μετά την ενημέρωση\\n" diff --git a/scripts/po/es.po b/scripts/po/es.po index 0e47f4a..c43bc24 100644 --- a/scripts/po/es.po +++ b/scripts/po/es.po @@ -9,7 +9,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-04-01 16:26+0000\n" "Last-Translator: Angel Velasquez <angvp(a)archlinux.org>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/" @@ -270,6 +270,9 @@ msgstr "No está permitido que %s esté vacío." msgid "%s is not allowed to start with a hyphen." msgstr "No está permitido que %s comience con un guion." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s no puede tener dos puntos, guiones o espacios en blanco." @@ -833,17 +836,20 @@ msgstr "Desactivación de las llaves revocadas en llavero ..." msgid "Disabling key %s..." msgstr "Deshabilitando llave %s..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "La llave especificada no puede ser añadida a la cadena de llaves gpg." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "" "La llave especificada no puede ser removida de la cadena de llaves gpg." msgid "The key identified by %s could not be edited." msgstr "La llave identificada por %s no puede ser editada." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "" "La llave especificada no puede ser exportada de la cadena de llaves gpg." @@ -964,7 +970,8 @@ msgstr "Rotando el sitio de la base de datos..." msgid "Finished. Your pacman database has been optimized." msgstr "Finalizado. Su base de datos de Pacman ha sido optimizada." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Uso: pkgdelta [-q] <paquete1> <paquete2>\\n" msgid "" @@ -977,6 +984,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Ejemplo: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Opciones:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet reducir salida\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -989,6 +1012,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Archivo de paquete no válido '%s'." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Los nombres de los paquetes no coinciden: '%s' y '%s'" @@ -1004,6 +1030,9 @@ msgstr "Generando delta de versión %s a la versión %s" msgid "Delta could not be created." msgstr "No se pudo crear delta." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Delta generado: '%s'" @@ -1024,9 +1053,6 @@ msgstr "" "\\nPueden ser agregados multiples paquetes especificandolo en la linea de " "comandos.\\n" -msgid "Options:\\n" -msgstr "Opciones:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr "" " -d, --delta genera y añade un diferencia para la actualización del" @@ -1053,9 +1079,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Por favor siga, no hay nada que ver aquí.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet reducir salida\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr "" " -s, --sign firmar la base de datos con GnuPG tras la actualización" diff --git a/scripts/po/fi.po b/scripts/po/fi.po index bdc671c..76743b4 100644 --- a/scripts/po/fi.po +++ b/scripts/po/fi.po @@ -9,7 +9,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-02-10 22:06+0000\n" "Last-Translator: Larso <larso(a)gmx.com>\n" "Language-Team: Finnish (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -267,6 +267,9 @@ msgstr "%s ei saa olla tyhjä." msgid "%s is not allowed to start with a hyphen." msgstr "%s ei saa alkaa tavuviivalla." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s ei saa sisältää tavuviivoja, kaksoispisteitä eikä tyhjiä välejä." @@ -810,16 +813,19 @@ msgstr "Poistetaan avainnipun mitätöidyt avaimet käytöstä..." msgid "Disabling key %s..." msgstr "Poistetaan avain %s käytöstä..." -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "Määritettyä avaintiedostoa ei voitu lisätä gpg-avainketjuun." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "Määritettyä avainta ei voitu poistaa gpg-avainketjusta." msgid "The key identified by %s could not be edited." msgstr "Avainta tunnisteella %s ei voitu muokata." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "Määritettyä avainta ei voitu viedä gpg-avainketjusta." msgid "The fingerprint of a specified key could not be determined." @@ -934,7 +940,8 @@ msgstr "Pyöritellään tietokantaa paikalleen..." msgid "Finished. Your pacman database has been optimized." msgstr "Valmis. Pakettitietokantasi on nyt optimoitu." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Käyttö: pkgdelta [-q] <paketti1> <paketti2>\\n" msgid "" @@ -947,6 +954,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Esimerkki: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Valinnat:\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet minimoi viestien määrä\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -959,6 +982,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Pakettitiedosto '%s' ei ole kelvollinen." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Pakettien nimet eivät täsmää: '%s' ja '%s'" @@ -974,6 +1000,9 @@ msgstr "Luodaan deltaa versiosta %s versioon %s" msgid "Delta could not be created." msgstr "Deltaa ei voitu luoda." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Luotiin delta: '%s'" @@ -994,9 +1023,6 @@ msgstr "" "repo-add päivittää pakettitietokannan lukemalla pakettitiedoston." "\\nKomentorivillä voi antaa useita päivitettäviä paketteja.\\n" -msgid "Options:\\n" -msgstr "Valinnat:\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr " -d, --delta luo ja lisää delta paketti\\n" @@ -1018,9 +1044,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Jatkakaa matkaanne, täällä ei ole mitään nähtävää.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet minimoi viestien määrä\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr " -s, --sign allekirjoita tietokanta GnuGP:llä\\n" diff --git a/scripts/po/fr.po b/scripts/po/fr.po index daac032..a3dd57e 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -12,7 +12,7 @@ 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: 2012-03-28 18:00-0500\n" +"POT-Creation-Date: 2012-05-20 11:26-0500\n" "PO-Revision-Date: 2012-02-07 03:54+0000\n" "Last-Translator: Dan McGee <dpmcgee(a)gmail.com>\n" "Language-Team: French (http://www.transifex.net/projects/p/archlinux-pacman/" @@ -276,6 +276,9 @@ msgstr "%s ne peut pas être vide." msgid "%s is not allowed to start with a hyphen." msgstr "%s ne peut pas commencer par un tiret." +msgid "%s contains invalid characters: '%s'" +msgstr "" + msgid "%s is not allowed to contain colons, hyphens or whitespace." msgstr "%s ne peut pas contenir de deux-points, de tirets ou d'espaces." @@ -869,18 +872,21 @@ msgstr "Désactivation des clefs révoquées du porte-clefs…" msgid "Disabling key %s..." msgstr "Désactivation de la clef %s…" -msgid "A specified keyfile could not be added to the gpg keychain." +#, fuzzy +msgid "A specified keyfile could not be added to the keyring." msgstr "" "Un fichier de clefs spécifié n'a pas pu être ajouté au porte-clefs GPG." -msgid "A specified key could not be removed from the gpg keychain." +#, fuzzy +msgid "A specified key could not be removed from the keyring." msgstr "" "Un fichier de clefs spécifié n'a pas pu être supprimé du porte-clefs GPG." msgid "The key identified by %s could not be edited." msgstr "La clef identifiée par %s n'a pas pu être éditée." -msgid "A specified key could not be exported from the gpg keychain." +#, fuzzy +msgid "A specified key could not be exported from the keyring." msgstr "Une clef spécifiée n'a pas pu être exporté du porte-clef GPG." msgid "The fingerprint of a specified key could not be determined." @@ -1008,7 +1014,8 @@ msgstr "Mise en place de la base de données..." msgid "Finished. Your pacman database has been optimized." msgstr "Fini. La base de données de pacman a été optimisée." -msgid "Usage: pkgdelta [-q] <package1> <package2>\\n" +#, fuzzy +msgid "Usage: pkgdelta [options] <package1> <package2>\\n" msgstr "Utilisation : pkgdelta [-q] <package1> <package2>\\n" msgid "" @@ -1021,6 +1028,22 @@ msgstr "" msgid "Example: pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" msgstr "Exemple : pkgdelta pacman-3.0.0.pkg.tar.gz pacman-3.0.1.pkg.tar.gz" +msgid "Options:\\n" +msgstr "Options :\\n" + +msgid " -q, --quiet minimize output\\n" +msgstr " -q, --quiet minimise la sortie\\n" + +msgid "" +" --min-pkg-size minimum package size before deltas are generated " +"(bytes)\\n" +msgstr "" + +msgid "" +" --max-delta-size percent of package size above which deltas will be " +"discarded\\n" +msgstr "" + msgid "" "Copyright (c) 2009 Xavier Chantry <shiningxc(a)gmail.com>.\\n\\nThis is free " "software; see the source for copying conditions.\\nThere is NO WARRANTY, to " @@ -1033,6 +1056,9 @@ msgstr "" msgid "Invalid package file '%s'." msgstr "Le paquet « %s » est invalide." +msgid "Skipping delta creation for small package: %s - size %s" +msgstr "" + msgid "The package names don't match : '%s' and '%s'" msgstr "Les nom du paquet n'est pas cohérent : « %s » et « %s »" @@ -1048,6 +1074,9 @@ msgstr "Génération du delta de la version %s vers la version %s" msgid "Delta could not be created." msgstr "Impossible de créer le delta." +msgid "Delta package larger than maximum size. Removing." +msgstr "" + msgid "Generated delta : '%s'" msgstr "Delta généré : « %s »" @@ -1070,9 +1099,6 @@ msgstr "" "« repo-add » va mêttre à jour un dépot à partir d'un paquet.\\nIl est " "possible de spécifier plusieurs paquets à ajouter.\\n" -msgid "Options:\\n" -msgstr "Options :\\n" - msgid " -d, --delta generate and add delta for package update\\n" msgstr "" " -d, --delta génère et ajoute un delta pour la mise à jour des paquets" @@ -1100,9 +1126,6 @@ msgstr "" msgid "Please move along, there is nothing to see here.\\n" msgstr "Veuillez partir, il n'y a rien à voir ici.\\n" -msgid " -q, --quiet minimize output\\n" -msgstr " -q, --quiet minimise la sortie\\n" - msgid " -s, --sign sign database with GnuPG after update\\n" msgstr "" " -s, --sign signer la base de données avec GnuPG après la mise à jour" diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 73d5be9..6226ee1 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -857,6 +857,8 @@ int main(int argc, char *argv[]) } } + pm_printf(ALPM_LOG_DEBUG, "pacman v%s - libalpm v%s\n", PACKAGE_VERSION, alpm_version()); + /* parse the config file */ ret = parseconfig(config->configfile); if(ret != 0) { -- 1.7.10.3

1 1

[pacman-dev] [PATCH] Create repo-remove symlink in scripts dir
by Allan McRae 07 Jun '12

07 Jun '12

Fix the creation of the repo-remove symlink in the scripts/ dir on building. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/Makefile.am | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9a08524..29c81aa 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -4,7 +4,9 @@ AUTOMAKE_OPTIONS = std-options SUBDIRS = po bin_SCRIPTS = \ - $(OURSCRIPTS) + $(OURSCRIPTS) \ + repo-remove \ + repo-elephant OURSCRIPTS = \ makepkg \ @@ -94,12 +96,12 @@ repo-add: \ $(srcdir)/library/output_format.sh repo-remove: $(srcdir)/repo-add.sh.in - $(RM) repo-remove - $(LN_S) repo-add repo-remove + $(AM_V_at)$(RM) repo-remove + $(AM_V_at)$(LN_S) repo-add repo-remove repo-elephant: $(srcdir)/repo-add.sh.in - $(RM) repo-elephant - $(LN_S) repo-add repo-elephant + $(AM_V_at)$(RM) repo-elephant + $(AM_V_at)$(LN_S) repo-add repo-elephant install-data-hook: cd $(DESTDIR)$(bindir) && \ -- 1.7.10.3

1 0

[pacman-dev] [RFC] [PATCH] makepkg: provide mechanism for auto-updating pkgver
by Allan McRae 05 Jun '12

05 Jun '12

Now that VCS repos are provided in the source array, it becomes too complicated to have automatic updating pkgver as was the case with the old VCS PKGBUILDs (there can be multiple repos of different types in the source array, the VCS repo may not be the package primary source, etc). Instead provide an optional way for a PKGBUILD to update the pkgver value through the specifing of a pkgver() function that returns the new version string. This is run after all source files are downloaded so can access the VCS repo if needed. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- Note that this means that now makepkg in no way modifies your PKGBUILD unless requested. For example... in a PKGBUILD: pkgver=1 source=('git+https://projects.archlinux.org/git/pacman.git#branch=maint') pkgver() { cd $srcdir/pacman ver=$(git describe | sed 's/-/_/g') printf "%s\n" "${ver##v}" } will set the pkgver to something like "4.0.3_17_g5de465d". scripts/makepkg.sh.in | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 689a2f6..7d4636f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -462,9 +462,30 @@ download_sources() { esac done + if declare -f pkgver >/dev/null; then + update_pkgver + fi + popd &>/dev/null } +# Automatically update pkgver variable if a pkgver() function is provided +# Re-sources the PKGBUILD afterwards to allow for other variables that use $pkgver +update_pkgver() { + newpkgver=$(pkgver) + + if [[ -n $newpkgver && $newpkgver != "$pkgver" ]]; then + if [[ -f $BUILDFILE && -w $BUILDFILE ]]; then + @SEDINPLACE@ "s/^pkgver=[^ ]*/pkgver=$newpkgver/" "$BUILDFILE" + @SEDINPLACE@ "s/^pkgrel=[^ ]*/pkgrel=1/" "$BUILDFILE" + source "$BUILDFILE" + else + warning "$(gettext "%s is not writeable -- pkgver will not be updated")" \ + "$BUILDFILE" + fi + fi +} + # Print 'source not found' error message and exit makepkg missing_source_file() { error "$(gettext "Unable to find source file %s.")" "$(get_filename "$1")" -- 1.7.10.3

1 0

[pacman-dev] [RFC] [PATCH 0/4] makepkg: VCS package overhaul
by Allan McRae 04 Jun '12

04 Jun '12

This is my first attempt at overhauling the really crap VCS PKGBUILD support in makepkg. So far only git is implemented. This is for initial comments. There is still much to tidy up (apart from reinstating all the other VCS...), but using git works. E.g. to make a package for pacman-git from the maint branch: source=('git+https://projects.archlinux.org/git/pacman.git#branch=maint') Currently you need to use --skipinteg, as integrity checking is broken. So is generating the integrity checks. Also, I would like ideas on how to stop the git repo being updated. This is a common request for having VCS PKGBUILDs work offline (assumably after an initial checkout...). Should I add a new flag, or just not error out when updating the repo fails? Allan McRae (4): makepkg: remove VCS package support makepkg: reorder source handling functions makepkg: generalize download_sources makepkg: allow using GIT source URLs scripts/makepkg.sh.in | 467 ++++++++++++++++++++++++------------------------- 1 file changed, 230 insertions(+), 237 deletions(-) -- 1.7.10.3

1 5

[pacman-dev] [PATCH] makepkg patch for scp
by William J. Bowman 03 Jun '12

03 Jun '12

Hello all, I recently tried to specify a source URL in a PKGBUILD of the form "scp://host:file". This caused all kinds of problem because, despite a DLAGENT for scp existing in the default makepkg.conf, that is an invalid URL for scp. After a bit of discussion in #archlinux, the correct solution seemed to be patching makepkg to seperate the protocol from the URL. So here's a patch. William Bowman From 4d0b60a4108bb71835553d0aafa70ba327bac036 Mon Sep 17 00:00:00 2001 From: "William J. Bowman" <wjb(a)williamjbowman.com> Date: Sat, 2 Jun 2012 17:17:18 -0400 Subject: [PATCH] Modified makepkg so DLAGENT can work with scp. Require %p to be specified in the DLAGENT agent string for the protocol to be included in the agent string, and changed the makepkg.conf to use it as part of the URL for all except scp. This change is because "scp://host:file" is not a valid URL for scp. Instead, scp expects only "host:file" (or user@host:file), without the protocol. Signed-off-by: William J. Bowman <wjb(a)williamjbowman.com> --- etc/makepkg.conf.in | 8 ++++---- scripts/makepkg.sh.in | 12 +++++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 51df493..433fd5d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -8,10 +8,10 @@ # #-- The download utilities that makepkg should use to acquire sources # Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' - 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync --no-motd -z %u %o' +DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %p://%u' + 'http::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %p://%u' + 'https::/usr/bin/curl -b "" -fLC - --retry 3 --retry-delay 3 -o %o %p://%u' + 'rsync::/usr/bin/rsync --no-motd -z %p://%u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 718b4e9..dccad87 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -433,6 +433,12 @@ download_file() { local url=$2 # destination file local file=$3 + + # To use scp, we can't have the protocol as part of the URL, so we + # seperate them and let the DLAGENT decide what to do with them. + local proto="${url%%://*}" + url="${url##*://}" + # temporary download file, default to last component of the URL local dlfile="${url##*/}" @@ -441,11 +447,15 @@ download_file() { dlcmd=${dlcmd//\%o/\"$file.part\"} dlfile="$file.part" fi + # add the protocol, or don't + if [[ $dlcmd = *%p* ]]; then + dlcmd=${dlcmd//\%p/\"$proto\"} + fi # add the URL, either in place of %u or at the end if [[ $dlcmd = *%u* ]]; then dlcmd=${dlcmd//\%u/\"$url\"} else - dlcmd="$dlcmd \"$url\"" + dlcmd="$dlcmd \"$proto://$url\"" fi local ret=0 -- 1.7.10.3

2 1

[pacman-dev] [PATCH] makepkg: allow url to be overridden in split packages
by Allan McRae 02 Jun '12

02 Jun '12

This is already being used (despite not working...) in packages in the Arch Linux repos. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- doc/PKGBUILD.5.txt | 6 +++--- proto/PKGBUILD-split.proto | 1 + scripts/makepkg.sh.in | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 384af7c..404a55c 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -324,9 +324,9 @@ Each split package uses a corresponding packaging function with name All options and directives for the split packages default to the global values given in the PKGBUILD. Nevertheless, the following ones can be overridden within each split package's packaging function: -`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `license`, `groups`, `depends`, -`optdepends`, `provides`, `conflicts`, `replaces`, `backup`, `options`, -`install` and `changelog`. +`pkgver`, `pkgrel`, `epoch`, `pkgdesc`, `arch`, `url`, `license`, `groups`, +`depends`, `optdepends`, `provides`, `conflicts`, `replaces`, `backup`, +`options`, `install` and `changelog`. An optional global directive is available when building a split package: diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 763cb86..f873db6 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -46,6 +46,7 @@ package_pkg1() { epoch= pkgdesc="" arch=() + url="" license=() groups=() depends=() diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index b0918ae..bd7a44f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,7 +46,7 @@ declare -r startdir="$PWD" packaging_options=('strip' 'docs' 'libtool' 'emptydirs' 'zipman' 'purge' 'upx') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') -splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'license' \ +splitpkg_overrides=('pkgver' 'pkgrel' 'epoch' 'pkgdesc' 'arch' 'url' 'license' \ 'groups' 'depends' 'optdepends' 'provides' 'conflicts' \ 'replaces' 'backup' 'options' 'install' 'changelog') readonly -a packaging_options other_options splitpkg_overrides -- 1.7.10.3

1 0