- Pacman-dev - lists.archlinux.org

[pacman-dev] [Bug] using strlen with utf8
by Pierre Schmitz 17 Feb '07

17 Feb '07

Hi, it seems as if the function strlen only counts the number of bytes within a given string and not the number of characters. In case of utf8 a character can have a length of one or two bytes. The attached screenshot show that in trans.c:337 the length is calculated wrong (because he counts the ü twice). When replacing ü with ue everything is right. Pierre -- http://www.archlinux.de

2 4

[pacman-dev] CVS update of pacman-lib (TODO.dan)
by dan＠archlinux.org 17 Feb '07

17 Feb '07

Date: Saturday, February 17, 2007 @ 00:06:13 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.10 -> 1.11) Small updates, read diff for details ----------+ TODO.dan | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.10 pacman-lib/TODO.dan:1.11 --- pacman-lib/TODO.dan:1.10 Wed Feb 14 14:35:41 2007 +++ pacman-lib/TODO.dan Sat Feb 17 00:06:13 2007 @@ -70,6 +70,9 @@ issues- use non-printf when necessary, make sure all two line printed messages (especially usage instructions) are printed using one print statement. +Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should +allow us to do this. + Other ideas: ============ @@ -77,8 +80,6 @@ Possibly split utilities/extras from pacman package -Rewrite gensync/updatesync - FS #4185 - move where message is logged, perhaps? ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a @@ -108,3 +109,11 @@ Revamp the downloadprog function a bit. Seems kind of messy. Add localized pkgdesc variables to makepkg. + +Fix inconsistency of args- _alpm_db_read, _alpm_db_write + +--print-uri option to sync should not require saying yes or no to up to date + +Resurrect test scripts, and add ones as needed. Testing by scripts > testing by +hand. +

1 0

[pacman-dev] CVS update of pacman-lib/contrib (pacsearch)
by dan＠archlinux.org 17 Feb '07

17 Feb '07

Date: Friday, February 16, 2007 @ 23:40:00 Author: dan Path: /home/cvs-pacman/pacman-lib/contrib Added: pacsearch (1.1) * Adding pacsearch - a script to search both the sync repos and locally installed packages in color, and indicate those which are installed. -----------+ pacsearch | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) Index: pacman-lib/contrib/pacsearch diff -u /dev/null pacman-lib/contrib/pacsearch:1.1 --- /dev/null Fri Feb 16 23:40:00 2007 +++ pacman-lib/contrib/pacsearch Fri Feb 16 23:39:59 2007 @@ -0,0 +1,77 @@ +#!/bin/bash +# pacsearch - Adds color and install information to a 'pacman -Ss' search +# +# Copyright (C) 2006-2007 Dan McGee <dpmcgee(a)gmail.com> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + +#TODO: colors flag on commandline + +readonly progname="pacsearch" + +readonly CLR1='\\\e[0;34m' +readonly CLR2='\\\e[0;32m' +readonly CLR3='\\\e[0;35m' +readonly CLR4='\\\e[0;36m' +readonly CLR5='\\\e[0;31m' +readonly CLR6='\\\e[0;33m' +readonly CLR7='\\\e[1;36m' +readonly INST='\\\e[1;31m' +readonly BASE='\\\e[0m' + +if [ -z "$1" ]; then + echo "Usage: $progname <pattern>" + echo "Ex: $progname ^gnome" + exit 0 +fi + +# Make two temp files and send output of commands to these files +querydump=$(mktemp) +pacman -Qs $1 > $querydump +syncdump=$(mktemp) +pacman -Ss $1 > $syncdump + +# Strip descriptions and 'local/' from -Qs query +instpkg=$(mktemp) +egrep '^[^ ]' $querydump | sed -e 's@^local/@@' > $instpkg + +# Add pkgs not in sync db, mark pkgs that are installed +cat $instpkg | while read -r pkg; do + if [ -z "$(grep "$pkg" $syncdump)" ]; then + # grep package name; pipe to another grep that prints at most one + # line starting with 'local/', allows for comments >1 line + grep -A10 "$pkg" $querydump | grep -A10 -m1 "local/" >> $syncdump + fi + sed -i "s@^$.\+/$pkg$@\***\1@" $syncdump +done + +# Print colorized package list and descriptions to screen +echo -e "$(sed -r \ + -e "s@current/.*@$CLR1&$BASE@" \ + -e "s@extra/.*@$CLR2&$BASE@" \ + -e "s@community/.*@$CLR3&$BASE@" \ + -e "s@testing/.*@$CLR4&$BASE@" \ + -e "s@unstable/.*@$CLR5&$BASE@" \ + -e "s@custom/.*@$CLR6&$BASE@" \ + -e "s@local/.*@$CLR7&$BASE@" \ + -e "s@(^|\*\*\*)([[:alnum:]]*/.* .*)@\1$CLR6\2$BASE@" \ + -e "s@\*\*\*@$INST&@" \ + < $syncdump )" +echo -en "\e[0m" + +rm $querydump +rm $syncdump +rm $instpkg +

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (alpm_list.h deps.c)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 17:41:51 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm_list.h (1.4 -> 1.5) deps.c (1.65 -> 1.66) * Removed unnecessary #define * Added comment for something I noticed while looking through code -------------+ alpm_list.h | 1 - deps.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/alpm_list.h diff -u pacman-lib/lib/libalpm/alpm_list.h:1.4 pacman-lib/lib/libalpm/alpm_list.h:1.5 --- pacman-lib/lib/libalpm/alpm_list.h:1.4 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/alpm_list.h Fri Feb 16 17:41:51 2007 @@ -60,7 +60,6 @@ alpm_list_t *alpm_list_next(alpm_list_t *list); alpm_list_t *alpm_list_last(alpm_list_t *list); void *alpm_list_getdata(const alpm_list_t *entry); -#define alpm_list_data(type, list) (type)alpm_list_getdata((list)) /* misc */ int alpm_list_count(const alpm_list_t *list); Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.65 pacman-lib/lib/libalpm/deps.c:1.66 --- pacman-lib/lib/libalpm/deps.c:1.65 Wed Jan 31 02:14:50 2007 +++ pacman-lib/lib/libalpm/deps.c Fri Feb 16 17:41:51 2007 @@ -138,6 +138,7 @@ for(i = newtargs; i; i = i->next) { pmpkg_t *p = (pmpkg_t*)i->data; _alpm_log(PM_LOG_DEBUG, "sorting %s", p->name); + /* TODO this may not always work if p->data is a fd, not db */ _alpm_db_read(p->data, INFRQ_DEPENDS, p); for(j = p->depends; j; j = j->next) { pmdepend_t dep;

1 0

[pacman-dev] CVS update of pacman-lib (NEWS)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 16:49:00 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.7 -> 1.8) Updated NEWS file with some of Roman's suggestions. ------+ NEWS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.7 pacman-lib/NEWS:1.8 --- pacman-lib/NEWS:1.7 Tue Feb 6 17:36:13 2007 +++ pacman-lib/NEWS Fri Feb 16 16:48:59 2007 @@ -15,19 +15,23 @@ - reduced unnecessary calling of ldconfig - selective loading of database to speed up certain operations - switch to usage of libdownload and libarchive + - improved proxy support as a result of switch to libdownload - debugging output improved with --debug flag - added 'rankmirrors' - script to show best available mirrors - added 'repo-add' - the backbone script for building repos - added pactest testing suite - abs - supports cvsup/csup, expanded configuration + - abs - supports fetching of testing repository - makepkg fixes: - new configuration file options format - support alternate integrity checks - extract files using filetype, not extension - added noextract array - - added option to log build process - - added repackage option - repackage pkg/ w/o building + - new option to log build process + - new repackage option - repackage pkg/ w/o building + - user-selectable paths for doc stripping - configurable source cache location + - dependencies now removed on a build success or failure - pacman-optimize - support DB's on separate filesystem 2.9.8 - Changed behaviour with original=X,current=Y,new=Z scenario - keep old in place, install new as .pacnew

3 3

[pacman-dev] CVS update of pacman-lib (3 files)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 17:04:23 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/de.po (1.4 -> 1.5) src/pacman/po/de.po (1.6 -> 1.7) translation-help (1.2 -> 1.3) * Updated German translation Pierre Schmitz <pierre(a)archlinux.de> * Added a blurb to 'translation-help' about wrapped messages in po files ----------------------+ lib/libalpm/po/de.po | 209 +++++++++++++++++++++++-------------------------- src/pacman/po/de.po | 141 +++++++++++++++------------------ translation-help | 11 ++ 3 files changed, 180 insertions(+), 181 deletions(-) Index: pacman-lib/lib/libalpm/po/de.po diff -u pacman-lib/lib/libalpm/po/de.po:1.4 pacman-lib/lib/libalpm/po/de.po:1.5 --- pacman-lib/lib/libalpm/po/de.po:1.4 Tue Feb 13 16:19:48 2007 +++ pacman-lib/lib/libalpm/po/de.po Fri Feb 16 17:04:23 2007 @@ -1,17 +1,17 @@ # translation of de.po to Deutsch -# translation of de.po to # German translations for Pacman package manager package. # Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org> # This file is distributed under the same license as the Pacman package manager package. # Marcus Habermehl <bmh1980(a)frugalware.org>, 2006. # Pierre Schmitz <pierre(a)archlinux.de>, 2007. # Niclas Pfeifer <macwolf(a)archlinux.de>, 2007. +# msgid "" msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-13 13:06+0100\n" -"PO-Revision-Date: 2007-02-13 14:13+0100\n" +"POT-Creation-Date: 2007-02-14 14:32-0500\n" +"PO-Revision-Date: 2007-02-16 13:14+0100\n" "Last-Translator: Pierre Schmitz <pierre(a)archlinux.de>\n" "Language-Team: Deutsch <archlinux.de>\n" "MIME-Version: 1.0\n" @@ -70,217 +70,212 @@ msgid "upgrading package %s-%s" msgstr "Aktualisiere Paket %s-%s" -#: lib/libalpm/add.c:404 lib/libalpm/conflict.c:308 lib/libalpm/conflict.c:338 -#, c-format -msgid "loading FILES info for '%s'" -msgstr "Lade FILES Informationen für '%s'" - -#: lib/libalpm/add.c:426 +#: lib/libalpm/add.c:419 #, c-format msgid "removing old package first (%s-%s)" msgstr "Entferne zuerst altes Paket (%s-%s)" -#: lib/libalpm/add.c:456 +#: lib/libalpm/add.c:449 #, c-format msgid "adding package %s-%s" msgstr "Füge Paket %s-%s hinzu" -#: lib/libalpm/add.c:467 +#: lib/libalpm/add.c:460 #, c-format msgid "adding new package %s-%s" msgstr "Füge neues Paket %s-%s hinzu" -#: lib/libalpm/add.c:471 +#: lib/libalpm/add.c:464 msgid "extracting files" msgstr "Entpacke Dateien" -#: lib/libalpm/add.c:487 lib/libalpm/util.c:461 +#: lib/libalpm/add.c:480 lib/libalpm/util.c:461 msgid "could not get current working directory" msgstr "Konnte aktuelles Arbeitsverzeichnis nicht ermitteln" -#: lib/libalpm/add.c:545 +#: lib/libalpm/add.c:538 #, c-format msgid "notice: %s is in NoExtract -- skipping extraction" msgstr "Hinweis: %s ist in NoExtract -- Wird nicht entpackt" -#: lib/libalpm/add.c:581 lib/libalpm/add.c:734 +#: lib/libalpm/add.c:574 lib/libalpm/add.c:727 #, c-format msgid "could not extract %s (%s)" msgstr "Konnte %s nicht entpacken (%s)" -#: lib/libalpm/add.c:624 +#: lib/libalpm/add.c:617 #, c-format msgid "checking md5 hashes for %s" msgstr "Prüfe MD5 Hashes für %s" -#: lib/libalpm/add.c:625 lib/libalpm/add.c:632 +#: lib/libalpm/add.c:618 lib/libalpm/add.c:625 #, c-format msgid "current: %s" msgstr "Aktuell: %s" -#: lib/libalpm/add.c:626 lib/libalpm/add.c:633 +#: lib/libalpm/add.c:619 lib/libalpm/add.c:626 #, c-format msgid "new: %s" msgstr "Neu: %s" -#: lib/libalpm/add.c:628 lib/libalpm/add.c:635 +#: lib/libalpm/add.c:621 lib/libalpm/add.c:628 #, c-format msgid "original: %s" msgstr "Original: %s" -#: lib/libalpm/add.c:631 +#: lib/libalpm/add.c:624 #, c-format msgid "checking sha1 hashes for %s" msgstr "Prüfe SHA1 Hashes für %s" -#: lib/libalpm/add.c:649 +#: lib/libalpm/add.c:642 #, c-format msgid "could not rename %s (%s)" msgstr "Konnte %s nicht umbenennen (%s)" -#: lib/libalpm/add.c:650 +#: lib/libalpm/add.c:643 #, c-format msgid "error: could not rename %s (%s)" msgstr "Fehler: Konnte %s nicht umbenennen (%s)" -#: lib/libalpm/add.c:654 lib/libalpm/add.c:698 +#: lib/libalpm/add.c:647 lib/libalpm/add.c:691 #, c-format msgid "could not copy %s to %s (%s)" msgstr "Konnte %s nicht nach %s kopieren (%s)" -#: lib/libalpm/add.c:655 +#: lib/libalpm/add.c:648 #, c-format msgid "error: could not copy %s to %s (%s)" msgstr "Fehler: Konnte %s nicht nach %s kopieren (%s)" -#: lib/libalpm/add.c:659 +#: lib/libalpm/add.c:652 #, c-format msgid "%s saved as %s.pacorig" msgstr "%s gesichert als %s.pacorig" -#: lib/libalpm/add.c:660 +#: lib/libalpm/add.c:653 #, c-format msgid "warning: %s saved as %s" msgstr "Warnung: %s gesichert als %s" -#: lib/libalpm/add.c:670 lib/libalpm/add.c:673 lib/libalpm/add.c:679 +#: lib/libalpm/add.c:663 lib/libalpm/add.c:666 lib/libalpm/add.c:672 msgid "action: installing new file" msgstr "Aktion: Installiere neue Datei" -#: lib/libalpm/add.c:677 +#: lib/libalpm/add.c:670 msgid "action: leaving existing file in place" msgstr "Aktion: Lasse existierende Datei an ihrem Platz" -#: lib/libalpm/add.c:683 +#: lib/libalpm/add.c:676 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "Aktion: Behalte aktuelle Datei und installiere Neue mit der Endung .pacnew" -#: lib/libalpm/add.c:687 +#: lib/libalpm/add.c:680 #, c-format msgid "could not install %s as %s: %s" msgstr "Konnte %s nicht als %s installieren: %s" -#: lib/libalpm/add.c:688 +#: lib/libalpm/add.c:681 #, c-format msgid "error: could not install %s as %s: %s" msgstr "Fehler: Konnte %s nicht als %s installieren: %s" -#: lib/libalpm/add.c:690 +#: lib/libalpm/add.c:683 #, c-format msgid "%s installed as %s" msgstr "%s installiert als %s" -#: lib/libalpm/add.c:691 +#: lib/libalpm/add.c:684 #, c-format msgid "warning: %s installed as %s" msgstr "Warnung: %s installiert als %s" -#: lib/libalpm/add.c:696 lib/libalpm/add.c:716 +#: lib/libalpm/add.c:689 lib/libalpm/add.c:709 #, c-format msgid "extracting %s" msgstr "Entpacke %s" -#: lib/libalpm/add.c:718 +#: lib/libalpm/add.c:711 #, c-format msgid "%s is in NoUpgrade -- skipping" msgstr "%s ist in NoUpgrade -- Überspringe" -#: lib/libalpm/add.c:720 +#: lib/libalpm/add.c:713 #, c-format msgid "extracting %s as %s.pacnew" msgstr "Entpacke %s als %s.pacnew" -#: lib/libalpm/add.c:721 +#: lib/libalpm/add.c:714 #, c-format msgid "warning: extracting %s%s as %s" msgstr "Warnung: Entpacke %s%s als %s" -#: lib/libalpm/add.c:735 +#: lib/libalpm/add.c:728 #, c-format msgid "error: could not extract %s (%s)" msgstr "Fehler: Konnte %s nicht entpacken (%s)" -#: lib/libalpm/add.c:745 +#: lib/libalpm/add.c:738 msgid "appending backup entry" msgstr "Hänge Sicherungseintrag an" -#: lib/libalpm/add.c:776 lib/libalpm/add.c:778 +#: lib/libalpm/add.c:769 lib/libalpm/add.c:771 #, c-format msgid "errors occurred while %s %s" msgstr "Fehler traten auf, während %s %s" -#: lib/libalpm/add.c:777 lib/libalpm/add.c:779 +#: lib/libalpm/add.c:770 lib/libalpm/add.c:772 msgid "upgrading" msgstr "aktualisiere" -#: lib/libalpm/add.c:777 lib/libalpm/add.c:779 +#: lib/libalpm/add.c:770 lib/libalpm/add.c:772 msgid "installing" msgstr "installiere" -#: lib/libalpm/add.c:800 lib/libalpm/add.c:856 +#: lib/libalpm/add.c:793 lib/libalpm/add.c:849 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "Füge '%s' zum requiredby Feld für '%s' hinzu" -#: lib/libalpm/add.c:811 lib/libalpm/remove.c:326 +#: lib/libalpm/add.c:804 lib/libalpm/remove.c:326 msgid "updating database" msgstr "Aktualisiere Datenbank" -#: lib/libalpm/add.c:812 +#: lib/libalpm/add.c:805 #, c-format msgid "adding database entry '%s'" msgstr "Füge Datenbankeintrag '%s' hinzu" -#: lib/libalpm/add.c:814 +#: lib/libalpm/add.c:807 #, c-format msgid "could not update database entry %s-%s" msgstr "Konnte Datenbankeintrag %s-%s nicht aktualisieren" -#: lib/libalpm/add.c:816 +#: lib/libalpm/add.c:809 #, c-format msgid "error updating database for %s-%s!" msgstr "Fehler beim aktualisieren der Datenbank für %s-%s!" -#: lib/libalpm/add.c:820 +#: lib/libalpm/add.c:813 #, c-format msgid "could not add entry '%s' in cache" msgstr "Konnte Eintrag '%s' nicht zum Pufferspeicher hinzufügen" -#: lib/libalpm/add.c:826 lib/libalpm/remove.c:336 +#: lib/libalpm/add.c:819 lib/libalpm/remove.c:336 msgid "updating dependency packages 'requiredby' fields" msgstr "Aktualisiere 'requiredby' Felder abhängiger Pakete" -#: lib/libalpm/add.c:848 +#: lib/libalpm/add.c:841 #, c-format msgid "could not find dependency '%s'" msgstr "Konnte Abhängigkeit '%s' nicht finden" -#: lib/libalpm/add.c:859 lib/libalpm/remove.c:378 +#: lib/libalpm/add.c:852 lib/libalpm/remove.c:378 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "Konnte 'requiredby' Eintrag %s-%s nicht aktualisieren" -#: lib/libalpm/add.c:885 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043 +#: lib/libalpm/add.c:878 lib/libalpm/remove.c:391 lib/libalpm/sync.c:1043 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "Führe \"ldconfig -r %s\" aus" @@ -339,145 +334,145 @@ #: lib/libalpm/alpm.c:479 #, c-format -msgid "could not get sha1 checksum for package %s-%s" +msgid "could not get sha1sum for package %s-%s" msgstr "Konnte SHA1 Prüfsumme für Paket %s-%s nicht ermitteln" -#: lib/libalpm/alpm.c:485 lib/libalpm/alpm.c:534 +#: lib/libalpm/alpm.c:485 #, c-format -msgid "loading DESC info for '%s'" -msgstr "Lade DESC Informationen für '%s'" +msgid "sha1sums for package %s-%s match" +msgstr "SHA1-Prüfsummen für Paket %s-%s stimmen überein" -#: lib/libalpm/alpm.c:490 lib/libalpm/alpm.c:539 -#, c-format -msgid "checksums for package %s-%s are matching" -msgstr "Prüfsummen für Paket %s-%s stimmen überein" - -#: lib/libalpm/alpm.c:493 +#: lib/libalpm/alpm.c:488 #, c-format msgid "sha1sums do not match for package %s-%s" msgstr "SHA1 Summen für Paket %s-%s stimmen nicht überein" -#: lib/libalpm/alpm.c:528 +#: lib/libalpm/alpm.c:523 #, c-format -msgid "could not get md5 checksum for package %s-%s" +msgid "could not get md5sum for package %s-%s" msgstr "Konnte MD5 Prüfsumme für Paket %s-%s nicht ermitteln" -#: lib/libalpm/alpm.c:542 +#: lib/libalpm/alpm.c:529 +#, c-format +msgid "md5sums for package %s-%s match" +msgstr "MD5-Prüfsummen für Paket %s-%s stimmen überein" + +#: lib/libalpm/alpm.c:532 #, c-format msgid "md5sums do not match for package %s-%s" msgstr "MD5 Summen für Paket %s-%s stimmen nicht überein" -#: lib/libalpm/alpm.c:791 +#: lib/libalpm/alpm.c:781 #, c-format msgid "could not remove lock file %s" msgstr "Konnte Sperrdatei %s nicht entfernen" -#: lib/libalpm/alpm.c:792 +#: lib/libalpm/alpm.c:782 #, c-format msgid "warning: could not remove lock file %s" msgstr "Warnung: Konnte Sperrdatei %s nicht entfernen" -#: lib/libalpm/alpm.c:927 +#: lib/libalpm/alpm.c:917 #, c-format msgid "config: new section '%s'" msgstr "Konfiguration: Neuer Abschnitt '%s'" -#: lib/libalpm/alpm.c:956 +#: lib/libalpm/alpm.c:946 msgid "config: nopassiveftp" msgstr "Konfiguration: nopassiveftp" -#: lib/libalpm/alpm.c:959 +#: lib/libalpm/alpm.c:949 msgid "config: usesyslog" msgstr "Konfiguration: usesyslog" -#: lib/libalpm/alpm.c:962 +#: lib/libalpm/alpm.c:952 msgid "config: chomp" msgstr "Konfiguration: chomp" -#: lib/libalpm/alpm.c:965 +#: lib/libalpm/alpm.c:955 msgid "config: usecolor" msgstr "Konfiguration: usecolor" -#: lib/libalpm/alpm.c:974 +#: lib/libalpm/alpm.c:964 #, c-format msgid "config: including %s" msgstr "Konfiguration: including %s" -#: lib/libalpm/alpm.c:984 lib/libalpm/alpm.c:989 +#: lib/libalpm/alpm.c:974 lib/libalpm/alpm.c:979 #, c-format msgid "config: noupgrade: %s" msgstr "Konfiguration: noupgrade: %s" -#: lib/libalpm/alpm.c:997 lib/libalpm/alpm.c:1002 +#: lib/libalpm/alpm.c:987 lib/libalpm/alpm.c:992 #, c-format msgid "config: noextract: %s" msgstr "Konfiguration: noextract: %s" -#: lib/libalpm/alpm.c:1010 lib/libalpm/alpm.c:1015 +#: lib/libalpm/alpm.c:1000 lib/libalpm/alpm.c:1005 #, c-format msgid "config: ignorepkg: %s" msgstr "Konfiguration: ignorepkg: %s" -#: lib/libalpm/alpm.c:1023 lib/libalpm/alpm.c:1028 +#: lib/libalpm/alpm.c:1013 lib/libalpm/alpm.c:1018 #, c-format msgid "config: holdpkg: %s" msgstr "Konfiguration: holdpkg: %s" -#: lib/libalpm/alpm.c:1035 +#: lib/libalpm/alpm.c:1025 #, c-format msgid "config: dbpath: %s" msgstr "Konfiguration: dbpath: %s" -#: lib/libalpm/alpm.c:1042 +#: lib/libalpm/alpm.c:1032 #, c-format msgid "config: cachedir: %s" msgstr "Konfiguration: cachedir: %s" -#: lib/libalpm/alpm.c:1045 +#: lib/libalpm/alpm.c:1035 #, c-format msgid "config: logfile: %s" msgstr "Konfiguration: logfile: %s" -#: lib/libalpm/alpm.c:1048 +#: lib/libalpm/alpm.c:1038 #, c-format msgid "config: xfercommand: %s" msgstr "Konfiguration: xfercommand: %s" -#: lib/libalpm/alpm.c:1053 +#: lib/libalpm/alpm.c:1043 #, c-format msgid "config: upgradedelay: %d" msgstr "Konfiguration: upgradedelay: %d" -#: lib/libalpm/alpm.c:1092 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197 +#: lib/libalpm/alpm.c:1082 lib/libalpm/sync.c:129 lib/libalpm/sync.c:197 msgid "checking for package replacements" msgstr "Prüfe auf Paketersetzungen" -#: lib/libalpm/alpm.c:1101 lib/libalpm/sync.c:138 +#: lib/libalpm/alpm.c:1091 lib/libalpm/sync.c:138 #, c-format msgid "checking replacement '%s' for package '%s'" msgstr "Prüfe Ersetzung '%s' für Paket '%s'" -#: lib/libalpm/alpm.c:1103 lib/libalpm/sync.c:140 +#: lib/libalpm/alpm.c:1093 lib/libalpm/sync.c:140 #, c-format msgid "%s-%s: ignoring package upgrade (to be replaced by %s-%s)" msgstr "%s-%s: Ignoriere zu aktualisierendes Packet (zu ersetzen durch %s-%s)" -#: lib/libalpm/alpm.c:1137 lib/libalpm/sync.c:174 +#: lib/libalpm/alpm.c:1127 lib/libalpm/sync.c:174 #, c-format msgid "%s-%s elected for upgrade (to be replaced by %s-%s)" msgstr "%s-%s wurde zum aktualisieren gewählt (wird durch %s-%s ersetzt)" -#: lib/libalpm/alpm.c:1158 lib/libalpm/sync.c:211 +#: lib/libalpm/alpm.c:1148 lib/libalpm/sync.c:211 #, c-format msgid "'%s' not found in sync db -- skipping" msgstr "'%s' nicht in sync DB gefunden -- Überspringe" -#: lib/libalpm/alpm.c:1172 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499 +#: lib/libalpm/alpm.c:1162 lib/libalpm/sync.c:225 lib/libalpm/sync.c:499 #, c-format msgid "'%s' is already elected for removal -- skipping" msgstr "'%s' ist bereits zum Entfernen ausgewählt -- Überspringe" -#: lib/libalpm/alpm.c:1178 lib/libalpm/sync.c:232 +#: lib/libalpm/alpm.c:1168 lib/libalpm/sync.c:232 #, c-format msgid "%s-%s elected for upgrade (%s => %s)" msgstr "%s-%s ausgewählt für Aktualisierung (%s => %s)" @@ -514,7 +509,7 @@ #: lib/libalpm/be_files.c:241 lib/libalpm/be_files.c:391 #: lib/libalpm/be_files.c:414 lib/libalpm/be_files.c:502 #: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618 -#: lib/libalpm/package.c:194 +#: lib/libalpm/package.c:197 #, c-format msgid "could not open file %s: %s" msgstr "Konnte Datei %s nicht öffnen: %s" @@ -594,11 +589,11 @@ msgid "db vs targs: found %s as a conflict for %s" msgstr "Datenbank gegen Paket: %s befindet sich im Konflikt mit %s" -#: lib/libalpm/conflict.c:271 lib/libalpm/conflict.c:370 lib/libalpm/deps.c:57 +#: lib/libalpm/conflict.c:297 lib/libalpm/conflict.c:346 lib/libalpm/deps.c:57 #: lib/libalpm/deps.c:593 lib/libalpm/deps.c:633 lib/libalpm/group.c:43 #: lib/libalpm/handle.c:49 lib/libalpm/package.c:78 lib/libalpm/sync.c:65 #: lib/libalpm/sync.c:604 lib/libalpm/sync.c:620 lib/libalpm/sync.c:716 -#: lib/libalpm/trans.c:49 lib/libalpm/util.c:599 lib/libalpm/util.c:606 +#: lib/libalpm/trans.c:49 lib/libalpm/util.c:607 lib/libalpm/util.c:614 #, c-format msgid "malloc failure: could not allocate %d bytes" msgstr "malloc Fehler: Konnte %d Bytes nicht allozieren" @@ -953,55 +948,55 @@ msgid "%s: local (%s) is newer than %s (%s)" msgstr "%s: Lokale Version (%s) ist neuer als %s (%s)" -#: lib/libalpm/package.c:155 +#: lib/libalpm/package.c:157 #, c-format msgid "%s-%s: ignoring package upgrade (%s)" msgstr "%s-%s: Ignoriere Paketaktualisierung (%s)" -#: lib/libalpm/package.c:160 +#: lib/libalpm/package.c:162 #, c-format msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: Verzögere Paketaktualisierung (%s)" -#: lib/libalpm/package.c:165 +#: lib/libalpm/package.c:168 #, c-format msgid "compare versions for %s: %s vs %s, result=%d" msgstr "Vergleiche Versionen für %s: %s gegen %s, Ergebnis=%d" -#: lib/libalpm/package.c:208 lib/libalpm/package.c:267 +#: lib/libalpm/package.c:211 lib/libalpm/package.c:270 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: Falscher Syntax in Beschreibungsdatei, Zeile %d" -#: lib/libalpm/package.c:341 +#: lib/libalpm/package.c:344 msgid "could not parse the package description file" msgstr "Konnte Paketbeschreibungsdatei nicht analysieren" -#: lib/libalpm/package.c:345 +#: lib/libalpm/package.c:348 #, c-format msgid "missing package name in %s" msgstr "Fehlender Paketname in %s" -#: lib/libalpm/package.c:349 +#: lib/libalpm/package.c:352 #, c-format msgid "missing package version in %s" msgstr "Fehlende Paketversion in %s" -#: lib/libalpm/package.c:384 +#: lib/libalpm/package.c:387 #, c-format msgid "could not remove tempfile %s" msgstr "Konnte tempfile %s nicht entfernen" -#: lib/libalpm/package.c:397 lib/libalpm/package.c:404 +#: lib/libalpm/package.c:400 lib/libalpm/package.c:407 #, c-format msgid "error while reading package: %s" msgstr "Fehler beim Paketlesen: %s" -#: lib/libalpm/package.c:410 +#: lib/libalpm/package.c:413 msgid "missing package metadata" msgstr "Fehlende Paketdaten" -#: lib/libalpm/package.c:417 +#: lib/libalpm/package.c:420 #, c-format msgid "missing package filelist in %s, generating one" msgstr "Fehlende Paketdateiliste in %s, erstelle eine" @@ -1124,7 +1119,7 @@ msgstr "Ziel '%s' wurde nicht gefunden -- suche nach Vorherigen" #: lib/libalpm/sync.c:291 lib/libalpm/sync.c:314 -#, fuzzy, c-format +#, c-format msgid "found '%s' as a provision for '%s'" msgstr "'%s' stellt '%s' bereit" @@ -1361,17 +1356,17 @@ msgid "call to popen failed (%s)" msgstr "Aufruf von popen fehlgeschlagen (%s)" -#: lib/libalpm/util.c:529 +#: lib/libalpm/util.c:536 #, c-format msgid "call to waitpid failed (%s)" msgstr "Aufruf von waitpid fehlgeschlagen (%s)" -#: lib/libalpm/util.c:537 +#: lib/libalpm/util.c:545 #, c-format msgid "could not remove tmpdir %s" msgstr "Konnte tmpdir %s nicht entfernen" -#: lib/libalpm/util.c:594 +#: lib/libalpm/util.c:602 #, c-format msgid "check_freespace: total pkg size: %lld, disk space: %lld" msgstr "Prüfe freien Speicher: Gesamte pkg Größe: %lld, Speicherplatz: %lld" Index: pacman-lib/src/pacman/po/de.po diff -u pacman-lib/src/pacman/po/de.po:1.6 pacman-lib/src/pacman/po/de.po:1.7 --- pacman-lib/src/pacman/po/de.po:1.6 Thu Feb 15 09:32:01 2007 +++ pacman-lib/src/pacman/po/de.po Fri Feb 16 17:04:23 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-15 09:24-0500\n" -"PO-Revision-Date: 2007-02-13 23:15+0100\n" +"POT-Creation-Date: 2007-02-16 13:09+0100\n" +"PO-Revision-Date: 2007-02-16 13:31+0100\n" "Last-Translator: Pierre Schmitz <pierre(a)archlinux.de>\n" "Language-Team: Deutsch <archlinux.de>\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ "X-Generator: KBabel 1.11.4\n" #: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79 -#: src/pacman/sync.c:438 src/pacman/sync.c:487 +#: src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "" " if you're sure a package manager is not already running,\n" @@ -45,7 +45,7 @@ msgid "done.\n" msgstr "fertig.\n" -#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572 +#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:614 #, c-format msgid "failed to prepare transaction (%s)\n" msgstr "Konnte Aktion nicht vorbereiten (%s)\n" @@ -55,22 +55,22 @@ msgid ":: %s: requires %s" msgstr ":: %s: Benötigt %s" -#: src/pacman/add.c:118 src/pacman/sync.c:601 +#: src/pacman/add.c:118 src/pacman/sync.c:643 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: Steht im Konflikt mit %s" -#: src/pacman/add.c:127 src/pacman/sync.c:665 -#, fuzzy, c-format +#: src/pacman/add.c:127 src/pacman/sync.c:707 +#, c-format msgid "%s%s exists in both '%s' and '%s'\n" -msgstr "%s%s existiert in \"%s\" (Paket) und \"%s\" (Paket)\n" +msgstr "%s%s existiert in '%s' und '%s'\n" -#: src/pacman/add.c:134 src/pacman/sync.c:672 +#: src/pacman/add.c:134 src/pacman/sync.c:714 #, c-format msgid "%s: %s%s exists in filesystem\n" msgstr "%s: %s%s existiert im Dateisystem\n" -#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685 +#: src/pacman/add.c:141 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -78,18 +78,18 @@ "\n" "Fehler aufgetreten, keine Pakete wurden aktualisiert.\n" -#: src/pacman/add.c:151 src/pacman/sync.c:608 +#: src/pacman/add.c:151 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB werden benötigt, %.1f MB stehen zur Verfügung" -#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658 +#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "Konnte den Vorgang (%s) nicht durchführen\n" -#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480 -#: src/pacman/sync.c:701 +#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:522 +#: src/pacman/sync.c:743 #, c-format msgid "failed to release transaction (%s)\n" msgstr "Konnte den Vorgang (%s) nicht freigeben\n" @@ -394,8 +394,7 @@ #: src/pacman/pacman.c:102 src/pacman/pacman.c:119 src/pacman/pacman.c:140 #, c-format msgid " -f, --force force install, overwrite conflicting files\n" -msgstr "" -" -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" +msgstr " -f, --force Installation erzwingen, Dateikonflikte überschreiben\n" #: src/pacman/pacman.c:104 #, c-format @@ -404,15 +403,12 @@ #: src/pacman/pacman.c:106 #, c-format -msgid "" -" -c, --cascade remove packages and all packages that depend on them\n" -msgstr "" -" -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" +msgid " -c, --cascade remove packages and all packages that depend on them\n" +msgstr " -c, --cascade Entfernt Pakete und alle, die von ihnen abhängen\n" #: src/pacman/pacman.c:108 #, c-format -msgid "" -" -k, --dbonly only remove database entry, do not remove files\n" +msgid " -k, --dbonly only remove database entry, do not remove files\n" msgstr " -k, --dbonly Nur Datenbankeintrag entfernen, keine Dateien\n" #: src/pacman/pacman.c:109 @@ -422,11 +418,8 @@ #: src/pacman/pacman.c:110 #, c-format -msgid "" -" -s, --recursive remove dependencies also (that won't break packages)\n" -msgstr "" -" -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine " -"Pakete)\n" +msgid " -s, --recursive remove dependencies also (that won't break packages)\n" +msgstr " -s, --recursive Auch Abhängigkeiten entfernen (beschädigt keine Pakete)\n" #: src/pacman/pacman.c:113 #, c-format @@ -505,8 +498,7 @@ msgid "" " -s, --search search locally-installed packages for matching " "strings\n" -msgstr "" -" -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n" +msgstr " -s, --search Durchsuche lokal installierte Pakete nach einem Wort\n" #: src/pacman/pacman.c:133 #, c-format @@ -543,10 +535,8 @@ #: src/pacman/pacman.c:144 #, c-format -msgid "" -" -s, --search search remote repositories for matching strings\n" -msgstr "" -" -s, --search Durchsuche entfernte Repositorien nach einem Wort\n" +msgid " -s, --search search remote repositories for matching strings\n" +msgstr " -s, --search Durchsuche entfernte Repositorien nach einem Wort\n" #: src/pacman/pacman.c:145 #, c-format @@ -564,8 +554,7 @@ #: src/pacman/pacman.c:147 #, c-format -msgid "" -" -y, --refresh download fresh package databases from the server\n" +msgid " -y, --refresh download fresh package databases from the server\n" msgstr " -y, --refresh Lade frische Paketdatenbank vom Server\n" #: src/pacman/pacman.c:148 @@ -589,25 +578,20 @@ #: src/pacman/pacman.c:152 #, c-format -msgid "" -" --ask <number> pre-specify answers for questions (see manpage)\n" -msgstr "" -" --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n" +msgid " --ask <number> pre-specify answers for questions (see manpage)\n" +msgstr " --ask <Nummer> Antworten für Fragen vorherbestimmen (Siehe manpage)\n" #: src/pacman/pacman.c:153 #, c-format -msgid "" -" --noprogressbar do not show a progress bar when downloading files\n" +msgid " --noprogressbar do not show a progress bar when downloading files\n" msgstr "" " --noprogressbar Keine Fortschrittsanzeige anzeigen, wenn Dateien\n" " heruntergeladen werden\n" #: src/pacman/pacman.c:154 #, c-format -msgid "" -" --noscriptlet do not execute the install scriptlet if there is any\n" -msgstr "" -" --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" +msgid " --noscriptlet do not execute the install scriptlet if there is any\n" +msgstr " --noscriptlet Installationskript nicht ausführen, falls vorhanden\n" #: src/pacman/pacman.c:155 #, c-format @@ -717,7 +701,7 @@ msgid "No package owns %s\n" msgstr "Kein Paket enthält %s\n" -#: src/pacman/query.c:119 src/pacman/sync.c:409 +#: src/pacman/query.c:119 src/pacman/sync.c:451 msgid "no usable package repositories configured.\n" msgstr "Keine brauchbaren Paket-Repositorien konfiguriert.\n" @@ -748,7 +732,7 @@ msgid "package \"%s\" not found\n" msgstr "Paket \"%s\" nicht gefunden\n" -#: src/pacman/remove.c:58 src/pacman/sync.c:524 +#: src/pacman/remove.c:58 src/pacman/sync.c:566 #, c-format msgid ":: group %s:\n" msgstr ":: Gruppe %s:\n" @@ -762,7 +746,7 @@ msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: %s aus Gruppe %s entfernen? [J/n] " -#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485 +#: src/pacman/remove.c:77 src/pacman/sync.c:478 src/pacman/sync.c:527 #, c-format msgid "failed to init transaction (%s)\n" msgstr "Konnte den Vorgang (%s) nicht starten\n" @@ -828,37 +812,47 @@ msgid " %s is up to date\n" msgstr " %s ist aktuell\n" -#: src/pacman/sync.c:337 +#: src/pacman/sync.c:343 +#, c-format +msgid "repository '%s' does not exist\n" +msgstr "Repositorium '%s' wurde nicht gefunden.\n" + +#: src/pacman/sync.c:359 +#, c-format +msgid "package '%s' was not found in repository '%s'\n" +msgstr "Paket '%s' wurde nicht in Repositorium '%s' gefunden.\n" + +#: src/pacman/sync.c:379 #, c-format -msgid "package \"%s\" was not found.\n" -msgstr "Paket \"%s\" wurde nicht gefunden.\n" +msgid "package '%s' was not found\n" +msgstr "Paket '%s' wurde nicht gefunden.\n" -#: src/pacman/sync.c:374 +#: src/pacman/sync.c:416 #, c-format msgid "repository \"%s\" was not found.\n" msgstr "Repositorium \"%s\" wurde nicht gefunden.\n" -#: src/pacman/sync.c:446 +#: src/pacman/sync.c:488 msgid ":: Synchronizing package databases...\n" msgstr ":: Synchronisiere Paketdatenbanken...\n" -#: src/pacman/sync.c:447 +#: src/pacman/sync.c:489 msgid "synchronizing package lists" msgstr "Synchronisiere Paketlisten" -#: src/pacman/sync.c:449 +#: src/pacman/sync.c:491 msgid "failed to synchronize any databases" msgstr "Konnte keine Datenbank synchronisieren" -#: src/pacman/sync.c:455 +#: src/pacman/sync.c:497 msgid ":: Starting full system upgrade...\n" msgstr ":: Starte komplette Systemaktualisierung...\n" -#: src/pacman/sync.c:456 +#: src/pacman/sync.c:498 msgid "starting full system upgrade" msgstr "Starte komplette Systemaktualisierung" -#: src/pacman/sync.c:474 +#: src/pacman/sync.c:516 msgid "" "\n" ":: pacman has detected a newer version of the \"pacman\" package.\n" @@ -866,55 +860,55 @@ "\n" ":: pacman hat eine neuere Version von \"pacman\" gefunden.\n" -#: src/pacman/sync.c:475 +#: src/pacman/sync.c:517 msgid ":: It is recommended that you allow pacman to upgrade itself\n" msgstr ":: Es wird empfohlen, zuerst pacman zu aktualisieren und\n" -#: src/pacman/sync.c:476 +#: src/pacman/sync.c:518 msgid ":: first, then you can re-run the operation with the newer version.\n" msgstr ":: danach Ihre Eingabe mit der neueren Version zu wiederholen.\n" -#: src/pacman/sync.c:478 +#: src/pacman/sync.c:520 msgid ":: Upgrade pacman first? [Y/n] " msgstr ":: Zuerst pacman aktualisieren? [J/n] " -#: src/pacman/sync.c:493 +#: src/pacman/sync.c:535 #, c-format msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:513 +#: src/pacman/sync.c:555 #, c-format msgid "'%s': %s\n" msgstr "'%s':%s\n" -#: src/pacman/sync.c:528 +#: src/pacman/sync.c:570 msgid ":: Install whole content? [Y/n] " msgstr ":: Gesamten Inhalt installieren? [J/n] " -#: src/pacman/sync.c:535 +#: src/pacman/sync.c:577 #, c-format msgid ":: Install %s from group %s? [Y/n] " msgstr ":: %s aus Gruppe %s installieren? [J/n] " -#: src/pacman/sync.c:559 +#: src/pacman/sync.c:601 #, c-format msgid "'%s': not found in sync db\n" msgstr "'%s': nicht in Synchronisations-Datenbank gefunden\n" -#: src/pacman/sync.c:579 +#: src/pacman/sync.c:621 msgid "requires" msgstr "benötigt" -#: src/pacman/sync.c:579 +#: src/pacman/sync.c:621 msgid "is required by" msgstr "wird benötigt von" -#: src/pacman/sync.c:621 +#: src/pacman/sync.c:663 msgid "local database is up to date\n" msgstr "lokale Datenbank ist aktuell\n" -#: src/pacman/sync.c:630 +#: src/pacman/sync.c:672 msgid "" "\n" "Beginning download...\n" @@ -922,11 +916,11 @@ "\n" "Beginne Download ...\n" -#: src/pacman/sync.c:634 +#: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " msgstr "Download fortsetzen? [J/n] " -#: src/pacman/sync.c:642 +#: src/pacman/sync.c:684 msgid "" "\n" "Beginning upgrade process...\n" @@ -934,7 +928,7 @@ "\n" "Beginne Aktualisierungsprozess...\n" -#: src/pacman/sync.c:646 +#: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " msgstr "Installation fortsetzen? [J/n] " @@ -1085,3 +1079,4 @@ #, c-format msgid "Total Installed Size: %.2f MB\n" msgstr "Gesamtgröße der installierten Pakete : %.2f MB\n" + Index: pacman-lib/translation-help diff -u pacman-lib/translation-help:1.2 pacman-lib/translation-help:1.3 --- pacman-lib/translation-help:1.2 Mon Feb 12 11:19:35 2007 +++ pacman-lib/translation-help Fri Feb 16 17:04:23 2007 @@ -37,7 +37,7 @@ Making a new language is not too hard, but be sure to follow all the steps. You will have to do the following steps in both the lib/libalpm/po/ and -src/pacman/po/ directories, substituting where approriate. First, edit the +src/pacman/po/ directories, substituting where appropriate. First, edit the LINGUAS file and add your new language code at the bottom. Next, run the following command, substituting 'libalpm.pot' or 'pacman.pot' depending on which directory you are currently working in: @@ -48,6 +48,15 @@ try to make them look similar to the other .po file headers. In addition, for all new translations we would strongly recommend using UTF-8 encoding. +Some other notes: +msgid and msgstr 'variables' can be on as many lines as necessary. Line breaks are ignored- if you need a literal line break, use an '\n' in your string. The following two translations are equivalent: + +msgstr "This is a test translation" + +msgstr "" +"This is a test translation" + + Translating Manpages --------------------

1 0

[pacman-dev] additions to NEWS file
by Roman Kyrylych 16 Feb '07

16 Feb '07

Just a quick list of what's missing from NEWS. Feel free to change wording to more appropriate where needed. pacman: - added -arch suffix to package tarballs - the speed of operations with lists is greatly improved - proxy support (right after "- switch to usage of libdownload and libarchive" line) - pacman now asks confirmation before cleaning cache - fixes for version checking - pacman now honours makepkg: - installed dependencies are removed when build fails too - -g and -o don't require -f and don't do deps check now - possibility to select paths to strip from info/docs - added testing repo to abs Sorry for not sending changes as a patch, I'm at work on windoze now. -- Roman Kyrylych (Роман Кирилич)

3 4

[pacman-dev] CVS update of pacman-lib/src/pacman/po (it.po)
by dan＠archlinux.org 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 16:38:31 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman/po Modified: it.po (1.5 -> 1.6) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> -------+ it.po | 93 +++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 51 insertions(+), 42 deletions(-) Index: pacman-lib/src/pacman/po/it.po diff -u pacman-lib/src/pacman/po/it.po:1.5 pacman-lib/src/pacman/po/it.po:1.6 --- pacman-lib/src/pacman/po/it.po:1.5 Thu Feb 15 09:32:01 2007 +++ pacman-lib/src/pacman/po/it.po Fri Feb 16 16:38:31 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-02-15 09:24-0500\n" -"PO-Revision-Date: 2007-02-14 21:00+0100\n" +"POT-Creation-Date: 2007-02-16 15:59+0100\n" +"PO-Revision-Date: 2007-02-16 17: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" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/pacman/add.c:69 src/pacman/deptest.c:57 src/pacman/remove.c:79 -#: src/pacman/sync.c:438 src/pacman/sync.c:487 +#: src/pacman/sync.c:480 src/pacman/sync.c:529 #, c-format msgid "" " if you're sure a package manager is not already running,\n" @@ -44,7 +44,7 @@ msgid "done.\n" msgstr "fatto.\n" -#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:572 +#: src/pacman/add.c:92 src/pacman/remove.c:98 src/pacman/sync.c:614 #, c-format msgid "failed to prepare transaction (%s)\n" msgstr "preparazione non riuscita (%s)\n" @@ -54,22 +54,22 @@ msgid ":: %s: requires %s" msgstr ":: %s: richiede %s" -#: src/pacman/add.c:118 src/pacman/sync.c:601 +#: src/pacman/add.c:118 src/pacman/sync.c:643 #, c-format msgid ":: %s: conflicts with %s" msgstr ":: %s: va in conflitto con %s" -#: src/pacman/add.c:127 src/pacman/sync.c:665 +#: src/pacman/add.c:127 src/pacman/sync.c:707 #, c-format msgid "%s%s exists in both '%s' and '%s'\n" msgstr "%s%s è presente in '%s' e in '%s'\n" -#: src/pacman/add.c:134 src/pacman/sync.c:672 +#: src/pacman/add.c:134 src/pacman/sync.c:714 #, c-format msgid "%s: %s%s exists in filesystem\n" msgstr "%s: %s%s è già presente nel filesystem\n" -#: src/pacman/add.c:141 src/pacman/sync.c:679 src/pacman/sync.c:685 +#: src/pacman/add.c:141 src/pacman/sync.c:721 src/pacman/sync.c:727 msgid "" "\n" "errors occurred, no packages were upgraded.\n" @@ -77,18 +77,18 @@ "\n" "si sono verificati degli errori, nessun pacchetto è stato aggiornato.\n" -#: src/pacman/add.c:151 src/pacman/sync.c:608 +#: src/pacman/add.c:151 src/pacman/sync.c:650 #, c-format msgid ":: %.1f MB required, have %.1f MB" msgstr ":: %.1f MB richiesti, spazio a disposizione %.1f MB" -#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:658 +#: src/pacman/add.c:164 src/pacman/remove.c:138 src/pacman/sync.c:700 #, c-format msgid "failed to commit transaction (%s)\n" msgstr "impossibile eseguire l'operazione richiesta (%s)\n" -#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:480 -#: src/pacman/sync.c:701 +#: src/pacman/add.c:174 src/pacman/remove.c:148 src/pacman/sync.c:522 +#: src/pacman/sync.c:743 #, c-format msgid "failed to release transaction (%s)\n" msgstr "impossibile annullare l'operazione richiesta (%s)\n" @@ -668,7 +668,6 @@ msgstr "è consentito eseguire solo un'operazione per volta\n" #: src/pacman/pacman.c:444 -#, fuzzy msgid "warning: current locale is invalid; using default \"C\" locale" msgstr "attenzione: locale non valido, verrà utilizzato il locale \"C\"" @@ -717,7 +716,7 @@ msgid "No package owns %s\n" msgstr "Nessun pacchetto contiene %s\n" -#: src/pacman/query.c:119 src/pacman/sync.c:409 +#: src/pacman/query.c:119 src/pacman/sync.c:451 msgid "no usable package repositories configured.\n" msgstr "nessun repository configurato.\n" @@ -748,7 +747,7 @@ msgid "package \"%s\" not found\n" msgstr "pacchetto \"%s\" non trovato\n" -#: src/pacman/remove.c:58 src/pacman/sync.c:524 +#: src/pacman/remove.c:58 src/pacman/sync.c:566 #, c-format msgid ":: group %s:\n" msgstr ":: gruppo %s:\n" @@ -762,7 +761,7 @@ msgid ":: Remove %s from group %s? [Y/n] " msgstr ":: Rimuovere %s dal gruppo %s? [Y/n] " -#: src/pacman/remove.c:77 src/pacman/sync.c:436 src/pacman/sync.c:485 +#: src/pacman/remove.c:77 src/pacman/sync.c:478 src/pacman/sync.c:527 #, c-format msgid "failed to init transaction (%s)\n" msgstr "inizializzazione non riuscita (%s)\n" @@ -828,37 +827,47 @@ msgid " %s is up to date\n" msgstr " %s è aggiornato\n" -#: src/pacman/sync.c:337 +#: src/pacman/sync.c:343 #, c-format -msgid "package \"%s\" was not found.\n" -msgstr "pacchetto \"%s\" non trovato.\n" +msgid "repository '%s' does not exist\n" +msgstr "impossibile trovare il repository '%s'\n" -#: src/pacman/sync.c:374 +#: src/pacman/sync.c:359 +#, c-format +msgid "package '%s' was not found in repository '%s'\n" +msgstr "impossibile trovare il pacchetto '%s' nel repository '%s'\n" + +#: src/pacman/sync.c:379 +#, c-format +msgid "package '%s' was not found\n" +msgstr "impossibile trovare il pacchetto '%s'\n" + +#: src/pacman/sync.c:416 #, c-format msgid "repository \"%s\" was not found.\n" -msgstr "repository \"%s\" non trovato.\n" +msgstr "impossibile trovare il repository \"%s\".\n" -#: src/pacman/sync.c:446 +#: src/pacman/sync.c:488 msgid ":: Synchronizing package databases...\n" msgstr ":: Sincronizzazione dei database in corso...\n" -#: src/pacman/sync.c:447 +#: src/pacman/sync.c:489 msgid "synchronizing package lists" msgstr "sincronizzazione della lista dei pacchetti in corso" -#: src/pacman/sync.c:449 +#: src/pacman/sync.c:491 msgid "failed to synchronize any databases" msgstr "impossibile sincronizzare i database" -#: src/pacman/sync.c:455 +#: src/pacman/sync.c:497 msgid ":: Starting full system upgrade...\n" msgstr ":: Aggiornamento del sistema in corso...\n" -#: src/pacman/sync.c:456 +#: src/pacman/sync.c:498 msgid "starting full system upgrade" msgstr "aggiornamento del sistema in corso" -#: src/pacman/sync.c:474 +#: src/pacman/sync.c:516 msgid "" "\n" ":: pacman has detected a newer version of the \"pacman\" package.\n" @@ -866,55 +875,55 @@ "\n" ":: pacman ha rilevato una versione più recente di \"pacman\".\n" -#: src/pacman/sync.c:475 +#: src/pacman/sync.c:517 msgid ":: It is recommended that you allow pacman to upgrade itself\n" msgstr ":: Si consiglia di consentire a pacman di aggiornarsi\n" -#: src/pacman/sync.c:476 +#: src/pacman/sync.c:518 msgid ":: first, then you can re-run the operation with the newer version.\n" msgstr ":: adesso e riavviare l'operazione con la versione più recente.\n" -#: src/pacman/sync.c:478 +#: src/pacman/sync.c:520 msgid ":: Upgrade pacman first? [Y/n] " msgstr ":: Aggiornare adesso pacman? [Y/n] " -#: src/pacman/sync.c:493 +#: src/pacman/sync.c:535 #, c-format msgid "pacman: %s\n" msgstr "pacman: %s\n" -#: src/pacman/sync.c:513 +#: src/pacman/sync.c:555 #, c-format msgid "'%s': %s\n" msgstr "'%s': %s\n" -#: src/pacman/sync.c:528 +#: src/pacman/sync.c:570 msgid ":: Install whole content? [Y/n] " msgstr ":: Installare tutto il contenuto? [Y/n] " -#: src/pacman/sync.c:535 +#: src/pacman/sync.c:577 #, c-format msgid ":: Install %s from group %s? [Y/n] " msgstr ":: Installare %s dal gruppo %s? [Y/n] " -#: src/pacman/sync.c:559 +#: src/pacman/sync.c:601 #, c-format msgid "'%s': not found in sync db\n" msgstr "'%s': non trovato nel database\n" -#: src/pacman/sync.c:579 +#: src/pacman/sync.c:621 msgid "requires" msgstr "richiede" -#: src/pacman/sync.c:579 +#: src/pacman/sync.c:621 msgid "is required by" msgstr "è richiesto da" -#: src/pacman/sync.c:621 +#: src/pacman/sync.c:663 msgid "local database is up to date\n" msgstr "Il database locale è aggiornato\n" -#: src/pacman/sync.c:630 +#: src/pacman/sync.c:672 msgid "" "\n" "Beginning download...\n" @@ -922,11 +931,11 @@ "\n" "Download in corso...\n" -#: src/pacman/sync.c:634 +#: src/pacman/sync.c:676 msgid "Proceed with download? [Y/n] " msgstr "Procedere con il download? [Y/n] " -#: src/pacman/sync.c:642 +#: src/pacman/sync.c:684 msgid "" "\n" "Beginning upgrade process...\n" @@ -934,7 +943,7 @@ "\n" "Aggiornamento in corso...\n" -#: src/pacman/sync.c:646 +#: src/pacman/sync.c:688 msgid "Proceed with installation? [Y/n] " msgstr "Procedere con l'installazione? [Y/n] "

1 0

[pacman-dev] CVS update of pacman-lib/contrib (bash_completion zsh_completion)
by Aaron Griffin 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 14:37:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Added: bash_completion (1.1) zsh_completion (1.1) Added a 'contrib' directory for other stuff that might be a good idea to maintain here. * moved bash_completion from the "archlinux" script in the official bash_completion package * moved zsh_completion from the AUR zsh-pacman package -----------------+ bash_completion | 348 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ zsh_completion | 320 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 668 insertions(+) Index: pacman-lib/contrib/bash_completion diff -u /dev/null pacman-lib/contrib/bash_completion:1.1 --- /dev/null Fri Feb 16 14:37:03 2007 +++ pacman-lib/contrib/bash_completion Fri Feb 16 14:37:03 2007 @@ -0,0 +1,348 @@ +# vim: set ft=sh: +# file: /etc/bash_completion.d/pacman + +# Bash completion for ArchLinux +# Original: v.1.1 Manolis Tzanidakis <mtzanidakis(a)freemail.gr> +# +# Distributed under the terms of the GNU General Public License, v2 or later. +# + +## Changelog #################################################### +# # +# * 1.1 (20040117) # +# - Code cleanup # +# - Updated to pacman 2.7.2-2 # +# * 20040216 (orelien) # +# - Improved available_{pkgs,groups) functions # +# - Added support for querying groups # +# # +################################################################# + +## initial functions +# + +rem_selected () +{ + # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) + # This removes any options from the list of completions that have + # already been specified on the command line. + COMPREPLY=($(echo "${COMP_WORDS[@]}" | \ + (while read -d ' ' i; do + [ "${i}" == "" ] && continue + # flatten array with spaces on either side, + # otherwise we cannot grep on word boundaries of + # first and last word + COMPREPLY=" ${COMPREPLY[@]} " + # remove word from list of completions + COMPREPLY=(${COMPREPLY/ ${i%% *} / }) + done + echo ${COMPREPLY[@]}))) + return 0 +} + +_available_repos () +{ + COMPREPLY=( $( compgen -W "$(grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) +} + +_installed_pkgs () +{ + local installed_pkgs + installed_pkgs=$( ls /var/lib/pacman/local/ ) + COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do echo ${i%-*-*}; done )" -- $cur ) ) +} + +_available_pkgs () +{ + #find balks easilly on a find /foo/*/* type dir, especially one like + # /var/lib/pacman/*/* + # This little change-up removes the find *and* only uses enabled repos + local available_pkgs + local enabled_repos + enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' ) + available_pkgs=$( for r in $enabled_repos; do echo /var/lib/pacman/$r/*; done ) + COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) +} + +_installed_groups () +{ + local installed_groups + installed_groups=$( find /var/lib/pacman/local -name desc -exec sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | sort -u ) + COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do echo ${i%-*-*}; done )" -- $cur ) ) +} + +_available_groups () +{ + #find balks easilly on a find /foo/*/* type dir, especially one like + # /var/lib/pacman/*/* + # This little change-up removes the find *and* only uses enabled repos + local available_groups + local enabled_repos + enabled_repos=$( grep '\[' /etc/pacman.conf | grep -v -e 'options' -e '^#' | tr -d '[]' ) + available_groups=$( for r in $enabled_repos; do sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/$r/*/desc | sort -u; done ) + COMPREPLY=( $( compgen -W "$( for i in $available_groups; do echo ${i%-*-*}; done )" -- $cur ) ) +} + +## init (/etc/rc.d) script completion (quick 'n' dirty ;-) +# + +complete -W "start stop restart" \ + $(for i in /etc/rc.d/*; do echo ${i##*/}; done) + +## makepkg completion +# + +_makepkg () +{ + local cur prev + COMPREPLY=() + cur=${COMP_WORDS[COMP_CWORD]} + prev=${COMP_WORDS[COMP_CWORD-1]} + + case "$prev" in + -@(p|w)) + _filedir + return 0 + ;; + --help|--cleancache|--genmd5) + COMPREPLY='' + return 0 + ;; + esac + + if [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '-b --builddeps \ + -c --clean \ + -C --cleancache \ + -d --nodeps \ + -f --force \ + -g --genmd5 \ + -h --help \ + -i --install \ + -m --nocolor \ + -n --nostrip \ + -r --rmdeps \ + -s --syncdeps \ + -p -w' -- $cur ) ) + fi + + rem_selected +} +complete -o default -F _makepkg makepkg + +## pacman completion +# + +_instring () +{ + str="${1}" + shift 1 + for c in "${@}"; do + if [ $(expr index "${str}" "${c}") -gt 0 ]; then + return 0 + fi + done + return 1 +} + +_pacman () +{ + local a arg toparse op mod cur + COMPREPLY=() + + # This argument parsing is done so we can check for flag existance later + # right now it's a tad crappy, but does the job + for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do + a=${COMP_WORDS[i]} + arg="${a:0:2}" + toparse="${a:2}" + + case "${arg}" in + -@(A|U|F|R|S|Q|h|V)) + op="${arg/-}" + mod="${mod}${a:2}" + ;; + --) + arg="${a:2}" + case "${arg}" in + add) op="A" ;; + remove) op="R" ;; + upgrade) op="U" ;; + freshen) op="F" ;; + query) op="Q" ;; + sync) op="S" ;; + help) op="h" ;; + version) op="V" ;; + verbose) mod="${mod}v" ;; + root) mod="${mod}r" ;; + dbpath) mod="${mod}b" ;; + nodeps) mod="${mod}d" ;; + force) mod="${mod}f" ;; + groups) mod="${mod}g" ;; + info) mod="${mod}i" ;; + list) mod="${mod}l" ;; + print-uris) mod="${mod}p" ;; + search) mod="${mod}s" ;; + sysupgrade) mod="${mod}u" ;; + downloadonly) mod="${mod}w" ;; + refresh) mod="${mod}y" ;; + orphans) mod="${mod}e" ;; + foreign) mod="${mod}m" ;; + owns) mod="${mod}o" ;; + file) mod="${mod}p" ;; + search) mod="${mod}s" ;; + cascade) mod="${mod}c" ;; + nodeps) mod="${mod}d" ;; + dbonly) mod="${mod}k" ;; + nosave) mod="${mod}n" ;; + recursive) mod="${mod}s" ;; + esac ;; + *) toparse="${a}" ;; + esac + + arglen=$(( ${#toparse}-1 )) + for c in $(seq 0 "${arglen}"); do + arg=${toparse:$c:1} + [ "${arg}" != "-" ] && mod="${mod}${arg}" + done + done + + cur=${COMP_WORDS[COMP_CWORD]} + + if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then + COMPREPLY=( $( compgen -W '\ + -A --add \ + -F --freshen \ + -h --help \ + -Q --query \ + -R --remove \ + -S --sync \ + -U --upgrade \ + -V --version \ + ' -- $cur ) ) + rem_selected + return 0 + fi + + if [[ "$cur" == -* ]]; then + case "${op}" in + A|U|F) + COMPREPLY=( $( compgen -W '\ + -d --nodeps \ + -f --force \ + -h --help \ + --config \ + --noconfirm \ + --noprogressbar \ + -v --verbose \ + -r --root \ + -b --dbpath \ + ' -- $cur ) ) + return 0 + ;; + R) + COMPREPLY=( $( compgen -W '\ + -c --cascade \ + -d --nodeps \ + -f --force \ + -h --help \ + -k --dbonly \ + -n --nosave \ + -s --recursive \ + --config \ + --noconfirm \ + --noprogressbar \ + -v --verbose \ + -r --root \ + -b --dbpath \ + ' -- $cur ) ) + return 0 + ;; + S) + COMPREPLY=( $( compgen -W '\ + -c --clean \ + -d --nodeps \ + -f --force \ + -g --groups \ + -h --help \ + -i --info \ + -l --list \ + -p --print-uris \ + -s --search \ + -u --sysupgrade \ + -w --downloadonly \ + -y --refresh \ + --config \ + --noconfirm \ + --noprogressbar \ + -v --verbose \ + -r --root \ + -b --dbpath \ + ' -- $cur ) ) + return 0 + ;; + Q) + COMPREPLY=( $( compgen -W '\ + -e --orphans \ + -g --groups \ + -h --help \ + -i --info \ + -l --list \ + -m --foreign \ + -o --owns \ + -p --file \ + -s --search \ + --config \ + --noconfirm \ + --noprogressbar \ + -v --verbose \ + -r --root \ + -b --dbpath \ + ' -- $cur ) ) + return 0 + ;; + esac + rem_selected + else + case "${op}" in + A|U) + COMPREPLY=( $( compgen -d -- "$cur" ) \ + $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + return 0 + ;; + h|V) + COMPREPLY='' + return 0 + ;; + Q) + if _instring $mod g; then + _installed_groups + elif _instring $mod o; then + COMPREPLY=( $( compgen -d -- "$cur" ) \ + $( compgen -f -- "$cur" ) ) + elif _instring $mod p; then + COMPREPLY=( $( compgen -d -- "$cur" ) \ + $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + else + _installed_pkgs + fi + return 0 + ;; + R) + _installed_pkgs + return 0 + ;; + S) + if _instring $mod l; then + _available_repos + else + _available_pkgs + fi + return 0 + ;; + esac + fi + + rem_selected +} +complete -o filenames -F _pacman pacman Index: pacman-lib/contrib/zsh_completion diff -u /dev/null pacman-lib/contrib/zsh_completion:1.1 --- /dev/null Fri Feb 16 14:37:03 2007 +++ pacman-lib/contrib/zsh_completion Fri Feb 16 14:37:03 2007 @@ -0,0 +1,320 @@ +# file: /usr/share/zsh/site-functions/_pacman +# use the following in your zsh config: +# compdef pacman pacman.static=pacman + +typeset -A opt_args + +# options for passing to _arguments: main pacman commands +_pacman_opts_commands=( + '-A[Add a package to the system]' + '-F[Upgrade an installed package]' + '-Q[Query the package database]' + '-R[Remove a package from the system]' + '-S[Synchronize packages]' + '-U[Upgrade a package]' + '-V[Display version and exit]' + '-h[Display usage]' +) + +# options for passing to _arguments: options common to all commands +_pacman_opts_common=( + '-b[Alternate database location]:database_location:_files -/' + '-h[Display syntax for the given operation]' + '-r[Set alternate installation root]:installation root:_files -/' + '-v[Be more verbose]' + '--config[An alternate configuration file]:config file:_files' + '--noconfirm[Do not ask for confirmation]' +) + +# options for passing to _arguments: options for --add, --freshen and --update commands +_pacman_opts_pkgfile=( + '-d[Skip dependency checks]' + '-f[Overwrite conflicting files]' + '*:package file:_files -g "*.pkg.tar.gz(.)"' +) + +# options for passing to _arguments: subactions for --query command +_pacman_opts_query_actions=( + '-e[List orphaned packages]:*:orphans:->query_orphans' + '-g[View all members of a package group]:*:package groups:->query_group' + '-o[Query the package that owns a file]:file:_files' + '-p[Package file to query]:*:package file:->query_file' + '-s[Search package names and descriptions]:*:search text:->query_search' +) + +# options for passing to _arguments: options for --query and subcommands +_pacman_opts_query_modifiers=( + '-i[View package information]' + '-l[List package contents]' +) + +# options for passing to _arguments: options for --remove command +_pacman_opts_remove=( + '-c[Remove all dependent packages]' + '-d[Skip dependency checks]' + '-k[Only remove database entry, do not remove files]' + '-n[Remove protected configuration files]' + '-s[Remove dependencies not required by other packages]' + '*:installed package:_pacman_completions_installed_packages' +) + +# options for passing to _arguments: options for --sync command +_pacman_opts_sync_actions=( + '*-c[Remove old packages from cache]:*:clean:->sync_clean' + '-g[View all members of a package group]:*:package groups:->sync_group' + '-s[Search package names and descriptions]:*:search text:->sync_search' +) + +# options for passing to _arguments: options for --sync command +_pacman_opts_sync_modifiers=( + '-d[Skip dependency checks]' + '-f[Overwrite conflicting files]' + '-i[View package information]' + '-l[List all packages in a repository]' + '-p[Print download URIs for each package to be installed]' + '-u[Upgrade all out-of-date packages]' + '-w[Download packages only]' + '-y[Download fresh package databases]' + '*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages' +) + +# handles --action subcommand +_pacman_action_add() { + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_pkgfile[@]" +} + +# handles --freshen subcommand +_pacman_action_freshen() { + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_pkgfile[@]" +} + +# handles --help subcommand +_pacman_action_help() { + _arguments -s : \ + "$_pacman_opts_commands[@]" +} + +# handles cases where no subcommand has yet been given +_pacman_action_none() { + _arguments -s : \ + "$_pacman_opts_commands[@]" +} + +# handles --query subcommand +_pacman_action_query() { + local context state line + typeset -A opt_args + +# _arguments -s : \ +# "$_pacman_opts_common[@]" \ +# "$_pacman_opts_query_actions[@]" \ +# "$_pacman_opts_query_modifiers[@]" + + case $state in + query_file) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files -g "*.pkg.tar.gz"' + ;; + query_group) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:groups:_pacman_completions_installed_groups' + ;; + query_orphans) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" + ;; + query_owner) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:file:_files' + ;; + query_search) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:search text: ' + ;; + *) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_actions[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package:_pacman_completions_installed_packages' + ;; + esac +} + +# handles --remove subcommand +_pacman_action_remove() { + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_remove[@]" +} + +# handles --sync subcommand +_pacman_action_sync() { + local context state line + typeset -A opt_args + +# _arguments -s : \ +# "$_pacman_opts_common[@]" \ +# "$_pacman_opts_sync_actions[@]" #\ +# #"$_pacman_opts_sync_modifiers[@]" + + case $state in + sync_clean) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*-c[Remove old packages from cache]' \ + ;; + sync_group) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package group:_pacman_completions_all_groups' + ;; + sync_search) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:search text: ' + ;; + *) + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package:_pacman_completions_all_packages' + ;; + esac +} + +# handles --upgrade subcommand +_pacman_action_upgrade() { + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_pkgfile[@]" +} + +# handles --version subcommand +_pacman_action_version() { + # no further arguments + return 0 +} + +# provides completions for package groups +_pacman_completions_all_groups() { + local -a cmd groups + _pacman_get_command + groups=( $(_call_program groups $cmd[@] -Sg | grep -e \^$PREFIX) ) + compadd "$@" -a groups +} + +# provides completions for packages available from repositories +_pacman_completions_all_packages() { + local -a cmd packages repositories + + repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | sort -u) ) + # these can be specified as either 'package' or 'repository/package' + if [[ "$PREFIX" == "" ]] ; then + packages=( $(_call_program packages ls /var/lib/pacman/${^repositories} | grep -v "^/" | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + else + packages=( $(_call_program packages ls /var/lib/pacman/${^repositories} | grep -v "^/" | grep -e \^$PREFIX | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + fi + compadd "$@" -a packages +} + +# provides completions for package groups +_pacman_completions_installed_groups() { + local -a cmd groups + _pacman_get_command + groups=( $(_call_program installed_groups $cmd[@] -Qg | cut -d' ' -f1 | grep -e \^$PREFIX | sort -u) ) + compadd "$@" -a groups +} + +# provides completions for installed packages +_pacman_completions_installed_packages() { + local -a cmd packages + packages=( $(_call_program installed_packages ls /var/lib/pacman/local | grep "^$PREFIX" | sed "s,\-[^-]*\-[^-]*$,,") ) + compadd "$@" -a packages +} + +# provides completions for repository names +_pacman_completions_repositories() { + local -a cmd repositories + repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | grep "^$PREFIX" | sort -u) ) + compadd "$@" -a repositories +} + +# builds command for invoking pacman in a _call_program command - extracts +# relevant options already specified (config file, etc) +# $cmd must be declared by calling function +_pacman_get_command() { + # this is mostly nicked from _perforce + cmd=( "pacman" ) + integer i + for (( i = 2; i < CURRENT - 1; i++ )); do + if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then + cmd+=( ${words[i,i+1]} ) + fi + done +} + +# main dispatcher +_pacman() { + case $words[2] in + -A*) _pacman_action_add ;; + -F*) _pacman_action_freshen ;; + -Qg) # ipkg groups + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:groups:_pacman_completions_installed_groups' + ;; + -Qo) # file *.pkg.tar.gz + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files' + ;; + -Qp) # file *.pkg.tar.gz + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_query_modifiers[@]" \ + '*:package file:_files -g "*.pkg.tar.gz"' + ;; + -Q*) _pacman_action_query ;; + -R*) _pacman_action_remove ;; + -Sl) # repos + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package repo:_pacman_completions_repositories' \ + ;; + -Sg) # pkg groups + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package group:_pacman_completions_all_groups' + ;; + -S*) _pacman_action_sync ;; + -U*) _pacman_action_upgrade ;; + -V*) _pacman_action_version ;; + -h*) _pacman_action_help ;; + - ) _pacman_action_none ;; + * ) return 1 ;; + esac +} + +# run the main dispatcher +_pacman "$@"

1 0

[pacman-dev] CVS update of pacman-lib/contrib [new]
by Aaron Griffin 16 Feb '07

16 Feb '07

Date: Friday, February 16, 2007 @ 14:33:25 Author: aaron Path: /home/cvs-pacman/pacman-lib/contrib Directory /home/cvs-pacman/pacman-lib/contrib added to the repository

1 0