moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Dan McGee 2011-03-16 19:55:28 -05:00
commit e6c9076a74
30 changed files with 111 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/index.txt
View File

@ -63,6 +63,7 @@ Releases
`------------`------- `------------`-------
Date Version Date Version
--------------------- ---------------------
2011-03-16 v3.5.0
2011-01-22 v3.4.3 2011-01-22 v3.4.3
2010-12-29 v3.4.2 2010-12-29 v3.4.2
2010-09-03 v3.4.1 2010-09-03 v3.4.1

8
doc/pacman.8.txt
View File

@ -11,7 +11,7 @@ pacman - package manager utility
Synopsis Synopsis
-------- --------
'pacman' <operation> [options] [packages] 'pacman' <operation> [options] [targets]
Description Description
@ -25,6 +25,12 @@ Since version 3.0.0, pacman has been the frontend to linkman:libalpm[3], the
``Arch Linux Package Management'' library. This library allows alternative ``Arch Linux Package Management'' library. This library allows alternative
front ends to be written (for instance, a GUI front end). front ends to be written (for instance, a GUI front end).
Invoking pacman involves specifying an operation with any potential options and
targets to operate on. A 'target' is usually a package name, filename, URL, or
a search string. Targets can be provided as command line arguments.
Additionally, if a single dash (-) is passed as an argument, targets will be
read from stdin.
Operations Operations
---------- ----------

2
lib/libalpm/alpm_list.c
View File

@ -287,7 +287,7 @@ alpm_list_t SYMEXPORT *alpm_list_msort(alpm_list_t *list, size_t n, alpm_list_fn
/** /**
* @brief Remove an item from the list. * @brief Remove an item from the list.
* item is not freed; this is the respnsiblity of the caller. * item is not freed; this is the responsiblity of the caller.
* *
* @param haystack the list to remove the item from * @param haystack the list to remove the item from
* @param item the item to remove from the list * @param item the item to remove from the list

4
lib/libalpm/diskspace.c
View File

@ -168,7 +168,7 @@ static int calculate_removed_size(const alpm_list_t *mount_points,
mp = match_mount_point(mount_points, path); mp = match_mount_point(mount_points, path);
if(mp == NULL) { if(mp == NULL) {
_alpm_log(PM_LOG_WARNING, _alpm_log(PM_LOG_WARNING,
_("could not determine mount point for file %s"), filename); _("could not determine mount point for file %s\n"), filename);
continue; continue;
} }
@ -230,7 +230,7 @@ static int calculate_installed_size(const alpm_list_t *mount_points,
mp = match_mount_point(mount_points, path); mp = match_mount_point(mount_points, path);
if(mp == NULL) { if(mp == NULL) {
_alpm_log(PM_LOG_WARNING, _alpm_log(PM_LOG_WARNING,
_("could not determine mount point for file %s"), filename); _("could not determine mount point for file %s\n"), filename);
continue; continue;
} }

4
lib/libalpm/po/ca.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/cs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-14 18:54+0000\n" "PO-Revision-Date: 2011-03-14 18:54+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: Czech <None>\n" "Language-Team: Czech <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "nepodařilo se získat informace o souborovém systému %s: %s\n" msgstr "nepodařilo se získat informace o souborovém systému %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "nepodařilo se určit připojovací bod pro soubor %s" msgstr "nepodařilo se určit připojovací bod pro soubor %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

4
lib/libalpm/po/da.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: Danish <None>\n" "Language-Team: Danish <None>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-08 14:50+0000\n" "PO-Revision-Date: 2011-03-08 14:50+0000\n"
"Last-Translator: tlaloc <matthias@archlinux.de>\n" "Last-Translator: tlaloc <matthias@archlinux.de>\n"
"Language-Team: German <None>\n" "Language-Team: German <None>\n"
@ -190,8 +190,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "Konnte keine Dateisystem-Informationen für %s erhalten: %s\n" msgstr "Konnte keine Dateisystem-Informationen für %s erhalten: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln" msgstr "Konnte keinen Einhänge-Punkt für die Datei %s ermitteln\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/el.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-05 00:39+0000\n" "PO-Revision-Date: 2011-03-05 00:39+0000\n"
"Last-Translator: nous <nous@archlinux.us>\n" "Last-Translator: nous <nous@archlinux.us>\n"
"Language-Team: Greek <None>\n" "Language-Team: Greek <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "αδυναμία λήψης πληροφοριών συστήματος αρχείων για το %s: %s\n" msgstr "αδυναμία λήψης πληροφοριών συστήματος αρχείων για το %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "αδυναμία καθορισμού σημείου προσάρτησης αρχείου %s" msgstr "αδυναμία καθορισμού σημείου προσάρτησης αρχείου %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/en_GB.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-11 04:03+0000\n" "PO-Revision-Date: 2011-03-11 04:03+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "could not get filesystem information for %s: %s\n" msgstr "could not get filesystem information for %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "could not determine mount point for file %s" msgstr "could not determine mount point for file %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-15 18:34+0000\n" "PO-Revision-Date: 2011-03-15 18:34+0000\n"
"Last-Translator: Traumness <traumness@gmail.com>\n" "Last-Translator: Traumness <traumness@gmail.com>\n"
"Language-Team: Spanish (Castilian) <>\n" "Language-Team: Spanish (Castilian) <>\n"
@ -192,8 +192,8 @@ msgstr ""
"\n" "\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "no se pudo determinar el punto de montaje para el archivo %s" msgstr "no se pudo determinar el punto de montaje para el archivo %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

4
lib/libalpm/po/fi.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-12 18:34+0000\n" "PO-Revision-Date: 2011-03-12 18:34+0000\n"
"Last-Translator: Huulivoide <jesse.jaara@gmail.com>\n" "Last-Translator: Huulivoide <jesse.jaara@gmail.com>\n"
"Language-Team: Finnish <None>\n" "Language-Team: Finnish <None>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/fr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 20:43+0000\n" "PO-Revision-Date: 2011-03-04 20:43+0000\n"
"Last-Translator: shining <chantry.xavier@gmail.com>\n" "Last-Translator: shining <chantry.xavier@gmail.com>\n"
"Language-Team: French <>\n" "Language-Team: French <>\n"
@ -187,8 +187,8 @@ msgstr ""
"impossible de récupérer les informations du système de fichier pour %s: %s\n" "impossible de récupérer les informations du système de fichier pour %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "impossible de déterminer le point de montage pour le fichier %s" msgstr "impossible de déterminer le point de montage pour le fichier %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/hu.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-07 12:32+0000\n" "PO-Revision-Date: 2011-03-07 12:32+0000\n"
"Last-Translator: ngaba <ngaba@bibl.u-szeged.hu>\n" "Last-Translator: ngaba <ngaba@bibl.u-szeged.hu>\n"
"Language-Team: Hungarian <None>\n" "Language-Team: Hungarian <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "nem sikerült meghatározni a fájlrendszer-információt %s-hez: %s\n" msgstr "nem sikerült meghatározni a fájlrendszer-információt %s-hez: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "nem sikerült meghározni a csatolási pontot a %s fájlhoz" msgstr "nem sikerült meghározni a csatolási pontot a %s fájlhoz\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/it.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-05 17:03+0000\n" "PO-Revision-Date: 2011-03-05 17:03+0000\n"
"Last-Translator: giovanni <giovanni@archlinux.org>\n" "Last-Translator: giovanni <giovanni@archlinux.org>\n"
"Language-Team: Italian <None>\n" "Language-Team: Italian <None>\n"
@ -192,8 +192,8 @@ msgstr ""
"impossibile ottenere le informazione relative al filesystem per %s: %s\n" "impossibile ottenere le informazione relative al filesystem per %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "impossibile determinare il punto di montaggio del file %s" msgstr "impossibile determinare il punto di montaggio del file %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/kk.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-05 03:56+0000\n" "PO-Revision-Date: 2011-03-05 03:56+0000\n"
"Last-Translator: sotrud_nik <baurthefirst@gmail.com>\n" "Last-Translator: sotrud_nik <baurthefirst@gmail.com>\n"
"Language-Team: Kazakh <None>\n" "Language-Team: Kazakh <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "%s үшін файлдық жүйе ақпаратын алу мүмкін емес: %s\n" msgstr "%s үшін файлдық жүйе ақпаратын алу мүмкін емес: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "%s файлы үшін тіркеу нүктесін анықтау мүмкін емес" msgstr "%s файлы үшін тіркеу нүктесін анықтау мүмкін емес\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

4
lib/libalpm/po/ko.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: Korean <None>\n" "Language-Team: Korean <None>\n"
@ -184,7 +184,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

4
lib/libalpm/po/libalpm.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: pacman 3.5.0\n" "Project-Id-Version: pacman 3.5.0\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -184,7 +184,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

4
lib/libalpm/po/nb.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

4
lib/libalpm/po/pl.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

4
lib/libalpm/po/pt.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: Portuguese <>\n" "Language-Team: Portuguese <>\n"
@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/pt_BR.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-10 01:56+0000\n" "PO-Revision-Date: 2011-03-10 01:56+0000\n"
"Last-Translator: ambaratti <ambaratti.listas@gmail.com>\n" "Last-Translator: ambaratti <ambaratti.listas@gmail.com>\n"
"Language-Team: Portuguese (Brazilian) <None>\n" "Language-Team: Portuguese (Brazilian) <None>\n"
@ -189,8 +189,8 @@ msgstr ""
"não foi possível obter informações do sistema de arquivos para %s: %s\n" "não foi possível obter informações do sistema de arquivos para %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "não foi possível determinar o ponto de montagem para o arquivo %s" msgstr "não foi possível determinar o ponto de montagem para o arquivo %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

16
lib/libalpm/po/ro.po
View File

@ -7,9 +7,9 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-11 19:06+0000\n" "PO-Revision-Date: 2011-03-16 16:09+0000\n"
"Last-Translator: z0id <mihai@m1x.ro>\n" "Last-Translator: wonder <ibiru@archlinux.org>\n"
"Language-Team: Romanian <>\n" "Language-Team: Romanian <>\n"
"Language: ro\n" "Language: ro\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -76,11 +76,13 @@ msgstr "se extrage %s ca %s.pacnew\n"
#, c-format #, c-format
msgid "could not get current working directory\n" msgid "could not get current working directory\n"
msgstr "nu poate fi obținut directorul de lucru curent\n" msgstr "nu s-a putut determina directorul de lucru curent\n"
#, c-format #, c-format
msgid "could not change directory to %s (%s)\n" msgid "could not change directory to %s (%s)\n"
msgstr "nu poate fi schimbat directorul la %s (%s)\n" msgstr ""
"nu s-a putut intra în directorul %s (%s)\n"
"\n"
#, c-format #, c-format
msgid "problem occurred while upgrading %s\n" msgid "problem occurred while upgrading %s\n"
@ -191,8 +193,8 @@ msgstr ""
"nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n" "nu s-au putut obține informații despre sistemul de fișiere pentru %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "nu s-a putut determina locul de montare al fișierului %s" msgstr "nu s-a putut determina locul de montare al fișierului %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

6
lib/libalpm/po/ru.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 21:23+0000\n" "PO-Revision-Date: 2011-03-04 21:23+0000\n"
"Last-Translator: partizan <serg.partizan@gmail.com>\n" "Last-Translator: partizan <serg.partizan@gmail.com>\n"
"Language-Team: Russian <None>\n" "Language-Team: Russian <None>\n"
@ -189,8 +189,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "не удалось получить информацию о файловой системе для %s: %s\n" msgstr "не удалось получить информацию о файловой системе для %s: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "не удалось определить точку подключения для файла %s" msgstr "не удалось определить точку подключения для файла %s\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

4
lib/libalpm/po/sk.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

4
lib/libalpm/po/sv.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -186,7 +186,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/tr.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-05 01:11+0000\n" "PO-Revision-Date: 2011-03-05 01:11+0000\n"
"Last-Translator: ras0ir <ras0ir@eventualis.org>\n" "Last-Translator: ras0ir <ras0ir@eventualis.org>\n"
"Language-Team: Turkish <None>\n" "Language-Team: Turkish <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "%s için dosya sistemi bilgisi alınamadı: %s\n" msgstr "%s için dosya sistemi bilgisi alınamadı: %s\n"
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "%s dosyası için bağlama noktası belirlenemedi" msgstr "%s dosyası için bağlama noktası belirlenemedi\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

4
lib/libalpm/po/uk.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-04 18:24+0000\n" "PO-Revision-Date: 2011-03-04 18:24+0000\n"
"Last-Translator: toofishes <dpmcgee@gmail.com>\n" "Last-Translator: toofishes <dpmcgee@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -187,7 +187,7 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "" msgstr ""
#, c-format #, c-format

6
lib/libalpm/po/zh_CN.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Arch Linux Pacman package manager\n" "Project-Id-Version: Arch Linux Pacman package manager\n"
"Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n" "Report-Msgid-Bugs-To: http://bugs.archlinux.org/index.php?project=3\n"
"POT-Creation-Date: 2011-03-14 13:51-0500\n" "POT-Creation-Date: 2011-03-16 19:34-0500\n"
"PO-Revision-Date: 2011-03-15 05:36+0000\n" "PO-Revision-Date: 2011-03-15 05:36+0000\n"
"Last-Translator: leonfeng <rainofchaos@gmail.com>\n" "Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
"Language-Team: Chinese (China) <None>\n" "Language-Team: Chinese (China) <None>\n"
@ -186,8 +186,8 @@ msgid "could not get filesystem information for %s: %s\n"
msgstr "" msgstr ""
#, c-format #, c-format
msgid "could not determine mount point for file %s" msgid "could not determine mount point for file %s\n"
msgstr "无法确定文件 %s 的挂载点" msgstr "无法确定文件 %s 的挂载点\n"
#, c-format #, c-format
msgid "could not determine filesystem mount points" msgid "could not determine filesystem mount points"

58
src/pacman/pacman.c
View File

@ -817,21 +817,20 @@ static void option_add_cleanmethod(const char *value) {
* @param option the string (friendly) name of the option, used for messages * @param option the string (friendly) name of the option, used for messages
* @param optionfunc a function pointer to an alpm_option_add_* function * @param optionfunc a function pointer to an alpm_option_add_* function
*/ */
static void setrepeatingoption(const char *ptr, const char *option, static void setrepeatingoption(char *ptr, const char *option,
void (*optionfunc)(const char*)) void (*optionfunc)(const char*))
{ {
char *p = (char*)ptr;
char *q; char *q;
while((q = strchr(p, ' '))) { while((q = strchr(ptr, ' '))) {
*q = '\0'; *q = '\0';
(*optionfunc)(p); (*optionfunc)(ptr);
pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
p = q; ptr = q;
p++; ptr++;
} }
(*optionfunc)(p); (*optionfunc)(ptr);
pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr);
} }
static char *get_filename(const char *url) { static char *get_filename(const char *url) {
@ -954,7 +953,8 @@ cleanup:
return(ret); return(ret);
} }
static int _parse_options(char *key, char *value) static int _parse_options(const char *key, char *value,
const char *file, int linenum)
{ {
if(value == NULL) { if(value == NULL) {
/* options without settings */ /* options without settings */
@ -976,8 +976,9 @@ static int _parse_options(char *key, char *value)
} else if(strcmp(key, "CheckSpace") == 0) { } else if(strcmp(key, "CheckSpace") == 0) {
alpm_option_set_checkspace(1); alpm_option_set_checkspace(1);
} else { } else {
pm_printf(PM_LOG_ERROR, _("directive '%s' without value not recognized\n"), key); pm_printf(PM_LOG_WARNING,
return(1); _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
file, linenum, key, "options");
} }
} else { } else {
/* options with settings */ /* options with settings */
@ -1028,8 +1029,10 @@ static int _parse_options(char *key, char *value)
} else if (strcmp(key, "CleanMethod") == 0) { } else if (strcmp(key, "CleanMethod") == 0) {
setrepeatingoption(value, "CleanMethod", option_add_cleanmethod); setrepeatingoption(value, "CleanMethod", option_add_cleanmethod);
} else { } else {
pm_printf(PM_LOG_ERROR, _("directive '%s' with a value not recognized\n"), key);
return(1); pm_printf(PM_LOG_WARNING,
_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
file, linenum, key, "options");
} }
} }
@ -1163,7 +1166,7 @@ static int _parseconfig(const char *file, const char *givensection,
/* Include is allowed in both options and repo sections */ /* Include is allowed in both options and repo sections */
if(strcmp(key, "Include") == 0) { if(strcmp(key, "Include") == 0) {
if(value == NULL) { if(value == NULL) {
pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive %s needs a value\n"), pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"),
file, linenum, key); file, linenum, key);
ret = 1; ret = 1;
goto cleanup; goto cleanup;
@ -1175,12 +1178,12 @@ static int _parseconfig(const char *file, const char *givensection,
switch(globret) { switch(globret) {
case GLOB_NOSPACE: case GLOB_NOSPACE:
pm_printf(PM_LOG_DEBUG, pm_printf(PM_LOG_DEBUG,
"config file %s, line %d: include globing out of space\n", "config file %s, line %d: include globbing out of space\n",
file, linenum); file, linenum);
break; break;
case GLOB_ABORTED: case GLOB_ABORTED:
pm_printf(PM_LOG_DEBUG, pm_printf(PM_LOG_DEBUG,
"config file %s, line %d: include globing read error for %s\n", "config file %s, line %d: include globbing read error for %s\n",
file, linenum, value); file, linenum, value);
break; break;
case GLOB_NOMATCH: case GLOB_NOMATCH:
@ -1201,18 +1204,14 @@ static int _parseconfig(const char *file, const char *givensection,
} }
if(strcmp(section, "options") == 0) { if(strcmp(section, "options") == 0) {
/* we are either in options ... */ /* we are either in options ... */
if((ret = _parse_options(key, value)) != 0) { if((ret = _parse_options(key, value, file, linenum)) != 0) {
pm_printf(PM_LOG_ERROR, _("config file %s, line %d: problem in options section\n"),
file, linenum);
ret = 1;
goto cleanup; goto cleanup;
} }
continue;
} else { } else {
/* ... or in a repo section */ /* ... or in a repo section */
if(strcmp(key, "Server") == 0) { if(strcmp(key, "Server") == 0) {
if(value == NULL) { if(value == NULL) {
pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive %s needs a value\n"), pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"),
file, linenum, key); file, linenum, key);
ret = 1; ret = 1;
goto cleanup; goto cleanup;
@ -1222,10 +1221,9 @@ static int _parseconfig(const char *file, const char *givensection,
goto cleanup; goto cleanup;
} }
} else { } else {
pm_printf(PM_LOG_ERROR, _("config file %s, line %d: directive '%s' in repository section '%s' not recognized.\n"), pm_printf(PM_LOG_WARNING,
_("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"),
file, linenum, key, section); file, linenum, key, section);
ret = 1;
goto cleanup;
} }
} }
@ -1361,10 +1359,14 @@ int main(int argc, char *argv[])
cleanup(ret); cleanup(ret);
} }
/* we also support reading targets from stdin */ /* we support reading targets from stdin if a cmdline parameter is '-' */
if(!isatty(fileno(stdin))) { if(!isatty(fileno(stdin)) && alpm_list_find_str(pm_targets, "-")) {
char line[PATH_MAX]; char line[PATH_MAX];
int i = 0; int i = 0;
/* remove the '-' from the list */
pm_targets = alpm_list_remove_str(pm_targets, "-", NULL);
while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) { while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) {
if(isspace((unsigned char)line[i])) { if(isspace((unsigned char)line[i])) {
/* avoid adding zero length arg when multiple spaces separate args */ /* avoid adding zero length arg when multiple spaces separate args */