- Pacman-dev - lists.archlinux.org

[pacman-dev] [translations] Translations are not in good shape
by Dan McGee 17 Mar '11

17 Mar '11

Guys, If your language is in the following list, you need to fix your translations in Transifex ASAP, and do **NOT** do it online- it is likely the cause of most of this headache right now. Use the command line client or download the PO file through the web interface, translate it offline using a proven tool, and then reupload the file. And most importantly: ### If your translation tool does not run `msgfmt` for you, you need to do this before submitting! ### See below for the cacophony of errors that is holding up this release. -Dan lib/libalpm/po/: rm -f es.gmo && /usr/bin/msgfmt -c --statistics --verbose -o es.gmo es.po es.po:90: `msgid' and `msgstr' entries do not both end with '\n' es.po:435: `msgid' and `msgstr' entries do not both end with '\n' es.po:525: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 3 fatal errors es.po: 131 translated messages. rm -f zh_CN.gmo && /usr/bin/msgfmt -c --statistics --verbose -o zh_CN.gmo zh_CN.po zh_CN.po:154: `msgid' and `msgstr' entries do not both end with '\n' zh_CN.po:428: `msgid' and `msgstr' entries do not both end with '\n' zh_CN.po:496: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 3 fatal errors zh_CN.po: 127 translated messages, 4 untranslated messages. po/: rm -f es.gmo && /usr/bin/msgfmt -c --statistics --verbose -o es.gmo es.po es.po:177: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 1 fatal error es.po: 414 translated messages, 64 untranslated messages. rm -f es.gmo && /usr/bin/msgfmt -c --statistics --verbose -o es.gmo es.po es.po: 414 translated messages, 64 untranslated messages. rm -f fi.gmo && /usr/bin/msgfmt -c --statistics --verbose -o fi.gmo fi.po fi.po:1466: `msgid' and `msgstr' entries do not both end with '\n' fi.po:1653: `msgid' and `msgstr' entries do not both end with '\n' fi.po:1757: `msgid' and `msgstr' entries do not both end with '\n' fi.po:1847: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 4 fatal errors fi.po: 478 translated messages. rm -f pt_BR.gmo && /usr/bin/msgfmt -c --statistics --verbose -o pt_BR.gmo pt_BR.po pt_BR.po:1497: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1674: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1700: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1713: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1767: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1772: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1786: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1821: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1825: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1841: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1852: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1862: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1872: `msgid' and `msgstr' entries do not both end with '\n' pt_BR.po:1889: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 14 fatal errors pt_BR.po: 478 translated messages. rm -f ro.gmo && /usr/bin/msgfmt -c --statistics --verbose -o ro.gmo ro.po ro.po:79: `msgid' and `msgstr' entries do not both end with '\n' ro.po:177: `msgid' and `msgstr' entries do not both end with '\n' ro.po:186: `msgid' and `msgstr' entries do not both end with '\n' ro.po:344: `msgid' and `msgstr' entries do not both begin with '\n' ro.po:671: `msgid' and `msgstr' entries do not both end with '\n' ro.po:780: `msgid' and `msgstr' entries do not both end with '\n' ro.po:890: `msgid' and `msgstr' entries do not both end with '\n' ro.po:894: `msgid' and `msgstr' entries do not both end with '\n' ro.po:898: `msgid' and `msgstr' entries do not both end with '\n' ro.po:962: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1507: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1687: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1715: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1728: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1780: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1785: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1797: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1831: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1836: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1843: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1853: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1863: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1881: `msgid' and `msgstr' entries do not both end with '\n' ro.po:1897: `msgid' and `msgstr' entries do not both end with '\n' /usr/bin/msgfmt: found 24 fatal errors ro.po: 478 translated messages.

4 5

Re: [pacman-dev] [arch-dev-public] [signoff] pacman 3.5.0-1
by Dan McGee 17 Mar '11

17 Mar '11

Agh! Don't send me private emails without also sending them to a mailing list. 2011/3/17 Timothée Ravier <timothee.romain.ravier(a)gmail.com>: > Hello, > > Did you warn the bash-completion folks about the update ? > > I got those (wrong) completions with pacman : You should run -Sy once. > > ~$ sudo pacman -S > a to > '/var/lib/pacman/sync/extra.db' > du > /var/lib/pacman/sync/community.db > /var/lib/pacman/sync/kde-unstable.db > échoué: > '/var/lib/pacman/sync/community.db' > '/var/lib/pacman/sync/kde-unstable.db' > Erreur: > /var/lib/pacman/sync/community-testing.db > /var/lib/pacman/sync/multilib.db > Failed > '/var/lib/pacman/sync/community-testing.db' > '/var/lib/pacman/sync/multilib.db' > fichier /var/lib/pacman/sync/core.db > /var/lib/pacman/sync/testing.db > l'ouverture '/var/lib/pacman/sync/core.db' > '/var/lib/pacman/sync/testing.db' > open /var/lib/pacman/sync/extra.db > > Apart from that, it looks good for me. > > Tim >

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.5.0-18-ge6c9076
by dan＠archlinux.org 17 Mar '11

17 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via e6c9076a74f72d7c5164e2154ce1f47f8886e6e5 (commit) via 308aa38a40fb26d535f0b874bb64fe987126d03f (commit) via 3707d5bc468dcd8611073d22b24d6f6be19bbe94 (commit) via 40a6c5c5eca05b5f65b1dc0c6d5c87fcd313fb2e (commit) via deed0286ef7045ce54fc54f8cadebfe3ebb5f725 (commit) via e28c47ade3253a4126b20f42a7715c69ec3555aa (commit) via 771c002c98292c6567d0f4985d296e152c35166c (commit) via f1ea4c8d241f2242aeeaa264bc42806853b0802e (commit) via cff36093f3b778b3bda9c9d1a3acf24e36dd9f73 (commit) via f2eac18a6ec62db3ec53744064e05416024c1b30 (commit) via 4ad4527d104c915efa912d3e1e3a543fad7aca34 (commit) via 96e458b705eda4ddff7d6ec890cf1daf898e9186 (commit) via 8a58648471e3a5311529955cd91c1a082be10056 (commit) via a5b6a75787be01fc2a030b68eeaba07bc26db469 (commit) via 159e1b06a50c7e80171d88933698f107a7f5773a (commit) via 278c84710637a891c3407c3811f61b181359ea75 (commit) via 75bfe825fc4018173b0d7a3c4029094edb52d93a (commit) via 67391c2c6cfa0044f554fb6a6b9717175d8d83a3 (commit) from 92630c660710332d0e02dea5a3c06c48f75d7321 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e6c9076a74f72d7c5164e2154ce1f47f8886e6e5 Merge: cff3609 308aa38 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 16 19:55:28 2011 -0500 Merge branch 'maint' commit cff36093f3b778b3bda9c9d1a3acf24e36dd9f73 Merge: 92630c6 f2eac18 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 16 19:25:35 2011 -0500 Merge branch 'download' commit f2eac18a6ec62db3ec53744064e05416024c1b30 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Feb 8 21:05:53 2011 -0500 Remove all traces of libfetch Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 4ad4527d104c915efa912d3e1e3a543fad7aca34 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Feb 2 23:21:43 2011 -0500 dload: temp patch to allow curl/fetch coexistance this is just some debuggery to allow pacman to operate with both fetch and curl at the same time. use the PACMANDL variable to control which library is used. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 96e458b705eda4ddff7d6ec890cf1daf898e9186 Author: Dave Reisner <d(a)falconindy.com> Date: Tue Feb 1 15:38:37 2011 -0500 dload.c: add curl_download_internal This is a feature complete re-implementation of the fetch based internal downloader, with a few improvements: * support for SSL * gzip and deflate compression on HTTP connections * reuses a single connection over the entire session for lower resource usage. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 8a58648471e3a5311529955cd91c1a082be10056 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jan 15 15:38:16 2011 -0500 handle error case for PM_ERR_LIBCURL Add PM_ERR_LIBCURL to error enum and handle case in error.c by returning curl_easy_strerror() based on the error number carried by the gloabl alpm handle. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit a5b6a75787be01fc2a030b68eeaba07bc26db469 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Jan 14 12:17:39 2011 -0500 share code between libfetch and libcurl no actual code changes here. change preprocessor logic to include get_tempfile, get_destfile, signal handler enum, and the interrupt handler logic when either HAVE_LIBCURL or HAVE_LIBFETCH are defined. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 159e1b06a50c7e80171d88933698f107a7f5773a Author: Dave Reisner <d(a)falconindy.com> Date: Wed Jan 12 09:51:06 2011 -0500 prefix fetch based functions with fetch_ Do this in preparation for implementing similar curl based functionality. We want the ability to test these side by side. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 278c84710637a891c3407c3811f61b181359ea75 Author: Dave Reisner <d(a)falconindy.com> Date: Sat Jan 15 13:59:45 2011 -0500 handle: Add CURL* and CURLcode vars to struct Adding the CURLcode is necessary in order to return an error string from pm_error. Unlike libfetch, curl returns numerical error numbers and does not maintain a staticly allocated string with the last error generated. Adding the curl object itself to the handle is advantageous (and encouraged by curl_easy_perform(3)) because the handle is reusable for successive operations. This cuts back on overhead when downloading multiple files in a single transaction. Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 75bfe825fc4018173b0d7a3c4029094edb52d93a Author: Dave Reisner <d(a)falconindy.com> Date: Wed Dec 15 19:57:31 2010 -0500 add curl to alpm initialization and teardown routines Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 67391c2c6cfa0044f554fb6a6b9717175d8d83a3 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Dec 16 17:19:07 2010 -0500 Add configure.ac option for --with-curl To avoid breaking compilation, fetch defaults to 'no', and curl defaults to 'check'. Signed-off-by: Dave Reisner <d(a)falconindy.com> ----------------------------------------------------------------------- Summary of changes: configure.ac | 31 ++--- doc/index.txt | 1 + doc/pacman.8.txt | 8 +- lib/libalpm/alpm.c | 14 +- lib/libalpm/alpm.h | 1 + lib/libalpm/alpm_list.c | 2 +- lib/libalpm/diskspace.c | 4 +- lib/libalpm/dload.c | 304 ++++++++++++++++++-------------------------- lib/libalpm/dload.h | 2 - lib/libalpm/error.c | 19 +-- lib/libalpm/handle.c | 6 + lib/libalpm/handle.h | 10 ++ lib/libalpm/po/ca.po | 4 +- lib/libalpm/po/cs.po | 6 +- lib/libalpm/po/da.po | 4 +- lib/libalpm/po/de.po | 6 +- lib/libalpm/po/el.po | 6 +- lib/libalpm/po/en_GB.po | 6 +- lib/libalpm/po/es.po | 6 +- lib/libalpm/po/fi.po | 4 +- lib/libalpm/po/fr.po | 6 +- lib/libalpm/po/hu.po | 6 +- lib/libalpm/po/it.po | 6 +- lib/libalpm/po/kk.po | 6 +- lib/libalpm/po/ko.po | 4 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb.po | 4 +- lib/libalpm/po/pl.po | 4 +- lib/libalpm/po/pt.po | 4 +- lib/libalpm/po/pt_BR.po | 6 +- lib/libalpm/po/ro.po | 16 ++- lib/libalpm/po/ru.po | 6 +- lib/libalpm/po/sk.po | 4 +- lib/libalpm/po/sv.po | 4 +- lib/libalpm/po/tr.po | 6 +- lib/libalpm/po/uk.po | 4 +- lib/libalpm/po/zh_CN.po | 6 +- src/pacman/pacman.c | 58 +++++---- 38 files changed, 279 insertions(+), 319 deletions(-) hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] 3.5.0 is out
by Dan McGee 17 Mar '11

17 Mar '11

In case you missed the memo. Thanks to all that contributed. 3.5.1 will probably be rolled in the next week or so; translations will be updated again so if you didn't get yours done keep working in Transifex and I'll be pulling those again. -Dan

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.5.0-7-g308aa38
by dan＠archlinux.org 17 Mar '11

17 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 308aa38a40fb26d535f0b874bb64fe987126d03f (commit) via 3707d5bc468dcd8611073d22b24d6f6be19bbe94 (commit) via 40a6c5c5eca05b5f65b1dc0c6d5c87fcd313fb2e (commit) via deed0286ef7045ce54fc54f8cadebfe3ebb5f725 (commit) via e28c47ade3253a4126b20f42a7715c69ec3555aa (commit) via 771c002c98292c6567d0f4985d296e152c35166c (commit) via f1ea4c8d241f2242aeeaa264bc42806853b0802e (commit) from 92630c660710332d0e02dea5a3c06c48f75d7321 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 308aa38a40fb26d535f0b874bb64fe987126d03f Author: Dave Reisner <d(a)falconindy.com> Date: Wed Mar 16 20:24:11 2011 -0400 pacman.8: (re)document behavior of reading from stdin Change the term 'packages' to 'targets' in the synopsis as well, since command line parameters could just as well be groups, repos, or URLs. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3707d5bc468dcd8611073d22b24d6f6be19bbe94 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 16 19:03:52 2011 -0500 Warn but don't error for unknown pacman.conf directives This makes all the pacman developers' jobs harder as we have to switch files whenever running multiple pacman versions and are using newly introduced options. Instead of erroring out, print warnings and continue on. This patch also fixes a const-correctness issue. We immediately cast a 'const char *' to a 'char *' in setrepeatingoption(), which is just plain wrong as we manipulate the underlying string. Fix the types and remove the now unnecessary variable. Finally, a few messages change here for consistency and clarity and because we continue parsing rather than bailing out on a problem. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 40a6c5c5eca05b5f65b1dc0c6d5c87fcd313fb2e Author: Dave Reisner <d(a)falconindy.com> Date: Wed Mar 16 17:23:00 2011 -0400 Only read from stdin if '-' is provided as a target This prevents a regression for people who enjoy piping yes to pacman to avoid prompts. Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit deed0286ef7045ce54fc54f8cadebfe3ebb5f725 Author: Dave Reisner <d(a)falconindy.com> Date: Wed Mar 16 19:39:40 2011 -0400 alpm_list: fix typo in doxygen comment Signed-off-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e28c47ade3253a4126b20f42a7715c69ec3555aa Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 16 19:51:12 2011 -0500 Update translations for message with added newline Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 771c002c98292c6567d0f4985d296e152c35166c Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 12 10:32:20 2011 +1000 Add missing newline to warning message Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f1ea4c8d241f2242aeeaa264bc42806853b0802e Author: Dan McGee <dan(a)archlinux.org> Date: Wed Mar 16 19:32:01 2011 -0500 Update index.txt with 3.5.0 release Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 1 + doc/pacman.8.txt | 8 +++++- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/diskspace.c | 4 +- lib/libalpm/po/ca.po | 4 +- lib/libalpm/po/cs.po | 6 ++-- lib/libalpm/po/da.po | 4 +- lib/libalpm/po/de.po | 6 ++-- lib/libalpm/po/el.po | 6 ++-- lib/libalpm/po/en_GB.po | 6 ++-- lib/libalpm/po/es.po | 6 ++-- lib/libalpm/po/fi.po | 4 +- lib/libalpm/po/fr.po | 6 ++-- lib/libalpm/po/hu.po | 6 ++-- lib/libalpm/po/it.po | 6 ++-- lib/libalpm/po/kk.po | 6 ++-- lib/libalpm/po/ko.po | 4 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/nb.po | 4 +- lib/libalpm/po/pl.po | 4 +- lib/libalpm/po/pt.po | 4 +- lib/libalpm/po/pt_BR.po | 6 ++-- lib/libalpm/po/ro.po | 16 +++++++----- lib/libalpm/po/ru.po | 6 ++-- lib/libalpm/po/sk.po | 4 +- lib/libalpm/po/sv.po | 4 +- lib/libalpm/po/tr.po | 6 ++-- lib/libalpm/po/uk.po | 4 +- lib/libalpm/po/zh_CN.po | 6 ++-- src/pacman/pacman.c | 58 ++++++++++++++++++++++--------------------- 30 files changed, 111 insertions(+), 100 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Warn but don't error for unknown pacman.conf directives
by Dan McGee 17 Mar '11

17 Mar '11

This makes all the pacman developers' jobs harder as we have to switch files whenever running multiple pacman versions and are using newly introduced options. Instead of erroring out, print warnings and continue on. This patch also fixes a const-correctness issue. We immediately cast a 'const char *' to a 'char *' in setrepeatingoption(), which is just plain wrong as we manipulate the underlying string. Fix the types and remove the now unnecessary variable. Finally, a few messages change here for consistency and clarity and because we continue parsing rather than bailing out on a problem. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. Requested by Xavier, +1 from Allan. -Dan src/pacman/pacman.c | 50 ++++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 984bd1b..a520338 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -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 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*)) { - char *p = (char*)ptr; char *q; - while((q = strchr(p, ' '))) { + while((q = strchr(ptr, ' '))) { *q = '\0'; - (*optionfunc)(p); - pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); - p = q; - p++; + (*optionfunc)(ptr); + pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr); + ptr = q; + ptr++; } - (*optionfunc)(p); - pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, p); + (*optionfunc)(ptr); + pm_printf(PM_LOG_DEBUG, "config: %s: %s\n", option, ptr); } static char *get_filename(const char *url) { @@ -954,7 +953,8 @@ cleanup: 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) { /* options without settings */ @@ -976,8 +976,9 @@ static int _parse_options(char *key, char *value) } else if(strcmp(key, "CheckSpace") == 0) { alpm_option_set_checkspace(1); } else { - pm_printf(PM_LOG_ERROR, _("directive '%s' without 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"); } } else { /* options with settings */ @@ -1028,8 +1029,10 @@ static int _parse_options(char *key, char *value) } else if (strcmp(key, "CleanMethod") == 0) { setrepeatingoption(value, "CleanMethod", option_add_cleanmethod); } 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 */ if(strcmp(key, "Include") == 0) { 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); ret = 1; goto cleanup; @@ -1175,12 +1178,12 @@ static int _parseconfig(const char *file, const char *givensection, switch(globret) { case GLOB_NOSPACE: 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); break; case GLOB_ABORTED: 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); break; case GLOB_NOMATCH: @@ -1201,18 +1204,14 @@ static int _parseconfig(const char *file, const char *givensection, } if(strcmp(section, "options") == 0) { /* we are either in options ... */ - if((ret = _parse_options(key, value)) != 0) { - pm_printf(PM_LOG_ERROR, _("config file %s, line %d: problem in options section\n"), - file, linenum); - ret = 1; + if((ret = _parse_options(key, value, file, linenum)) != 0) { goto cleanup; } - continue; } else { /* ... or in a repo section */ if(strcmp(key, "Server") == 0) { 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); ret = 1; goto cleanup; @@ -1222,10 +1221,9 @@ static int _parseconfig(const char *file, const char *givensection, goto cleanup; } } 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); - ret = 1; - goto cleanup; } } -- 1.7.4.1

1 0

[pacman-dev] [PATCH] Only read from stdin if sole target is '-'
by Dave Reisner 16 Mar '11

16 Mar '11

This prevents a regression for people who enjoy piping yes to pacman to avoid prompts. Signed-off-by: Dave Reisner <d(a)falconindy.com> --- src/pacman/pacman.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 984bd1b..c66d34b 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1361,8 +1361,9 @@ int main(int argc, char *argv[]) cleanup(ret); } - /* we also support reading targets from stdin */ - if(!isatty(fileno(stdin))) { + /* we support reading targets from stdin if the only arg is '-' */ + if(!isatty(fileno(stdin) && alpm_list_count(pm_targets) == 1 && + strcmp(alpm_list_getdata(pm_targets), "-") == 0)) { char line[PATH_MAX]; int i = 0; while(i < PATH_MAX && (line[i] = (char)fgetc(stdin)) != EOF) { -- 1.7.4.1

1 0

Re: [pacman-dev] [arch-dev-public] [signoff] pacman 3.5.0-1
by Dave Reisner 16 Mar '11

16 Mar '11

On Wed, Mar 16, 2011 at 03:29:24PM -0500, Dan McGee wrote: > On Wed, Mar 16, 2011 at 3:26 PM, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: > > On Wed, Mar 16, 2011 at 3:24 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: > >> On Wed, Mar 16, 2011 at 3:18 PM, Gaetan Bisson <bisson(a)archlinux.org> wrote: > >>> [2011-03-16 15:10:08 -0500] Dan McGee: > >>>> 2. This is a terrible bug report. :/ I need output when you run this > >>>> by hand, maybe with --debug, etc. Help me help you by actually > >>>> providing details. > >>> > >>> I thought it was reproducible well enough. There is no debug output: > >>> > >>> yes | pacman -S --debug > >>> > >>> prints nothing and just eats up RAM. I will try to investigate more and > >>> let you know if I find anything. > >> > >> Damn! This is a huge regression disguised as a "feature" that I never > >> quite felt comfortable with... > >> http://projects.archlinux.org/pacman.git/commit/?id=4fb3cfc48f626f84329c783… > > > > You can do it "GNU style" and only read from stdin if the package list is "-" > > OMG, Aaron is here! > > That sounds like the way to go, or we are going to cause regressions > to anyone that expected prior behavior. Dave- does that make sense, > only read from stdin if an '-' arg is provided? > > -Dan A wild Griffin appears! This sounds like it would be a good compromise, but getopt won't allow this. It would need to be parsed as a target, which also means that it needs to be the _only_ target. Therefore, if... !isatty(fileno(stdin)) && alpm_list_count(targets) == 1 && alpm_list_getdata(targets) == '-' ...then we read stdin. It's a bit magical, but I'm happy to implement and update the doc if this is an acceptable fix. dave

1 0

Re: [pacman-dev] [arch-dev-public] [signoff] pacman 3.5.0-1
by Dan McGee 16 Mar '11

16 Mar '11

On Wed, Mar 16, 2011 at 3:26 PM, Aaron Griffin <aaronmgriffin(a)gmail.com> wrote: > On Wed, Mar 16, 2011 at 3:24 PM, Dan McGee <dpmcgee(a)gmail.com> wrote: >> On Wed, Mar 16, 2011 at 3:18 PM, Gaetan Bisson <bisson(a)archlinux.org> wrote: >>> [2011-03-16 15:10:08 -0500] Dan McGee: >>>> 2. This is a terrible bug report. :/ I need output when you run this >>>> by hand, maybe with --debug, etc. Help me help you by actually >>>> providing details. >>> >>> I thought it was reproducible well enough. There is no debug output: >>> >>> yes | pacman -S --debug >>> >>> prints nothing and just eats up RAM. I will try to investigate more and >>> let you know if I find anything. >> >> Damn! This is a huge regression disguised as a "feature" that I never >> quite felt comfortable with... >> http://projects.archlinux.org/pacman.git/commit/?id=4fb3cfc48f626f84329c783… > > You can do it "GNU style" and only read from stdin if the package list is "-" OMG, Aaron is here! That sounds like the way to go, or we are going to cause regressions to anyone that expected prior behavior. Dave- does that make sense, only read from stdin if an '-' arg is provided? -Dan

1 0

[pacman-dev] [GIT] The official pacman repository annotated tag, v3.5.0, created. v3.5.0
by dan＠archlinux.org 16 Mar '11

16 Mar '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The annotated tag, v3.5.0 has been created at d64a3783b52c0fef98a2b83e1421a45486ac4e77 (tag) tagging 92630c660710332d0e02dea5a3c06c48f75d7321 (commit) replaces v3.4.3 tagged by Dan McGee on Wed Mar 16 10:48:45 2011 -0500 - Log ----------------------------------------------------------------- Tar-backed sync DB, performance changes, epoch, disk space checking -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEABECAAYFAk2A2/kACgkQXC5GoPU6du3jtwCfTb/No2rwChgmNBXoaEK0gNNN 4PYAn3tdyAQ1sCkG7UfupkSDJXhUetA/ =4Xh7 -----END PGP SIGNATURE----- Allan McRae (80): makepkg: fallback to sane defaults for library stripping Clarify testing within conditional statements Do not compare signed and unsigned types makepkg: clarify aborting on packaging failure Check return value of fwrite when copying files Check return value of chdir and getcwd Check return value of fgets calls Remove DBEXT usage Download sync db into DBPath/sync Fix some whitespace issues makepkg: use regex to match options for privilege escalation makepkg: clarify invalid backup entry errors makepkg: remove unnecessary variable presence check makepkg: use less local variables in check_sanity makepkg: error out on empty optdepends entries repo-add: make --quiet output more quiet Add wrapper around asprintf calls Add FORTIFY_SOURCE support makepkg: remove STRIP_DIRS makepkg: improve srcdir check and add pkgdir makepkg: compare paths using bash test makepkg: canonicalize paths from environmental variables Fix documentation syntax and typo Move database handling utility functions Move db cache handling functions Separate be_files into be_sync and be_local Completely separate local and sync db handling Populate sync db from archive Parse sync database Only download sync databases Clean up all old database files and directories Restrict visibility of checkdbdir and get_pkgpath Move and rename splitname Remove lazy loading of deltas Clean-up parsing local database Clean-up parsing sync database Only write to local repos Add epoch to PKGBUILD prototypes Combine reading from depends and desc in sync db Move MAX_DELTA_RATIO definition Prototype disk space checking functionality Add function for listing system mount points Add function to match file to mount point Add functions to calculate approximate disk usage by packages Implement disk space checking Add configuration option to control disk space checking Display progress bar for disk space checking makepkg: perform sanity checks on variables in package functions Explicitly test time difference is greater than zero Merge desc and depends files in local db Update pactest suite for change in db structure Add script to update pacman database format Document PKGEXT and SRCEXT makepkg: remove last inappropriate PKGBUILD usage Always specify arguement type in function delcarations Only check diskspace availability if needs more than zero makepkg: allow pkgname usage in split package functions Correct type for hash value storage Detect undefined PATH_MAX Use limits.h for PATH_MAX makepkg: Add check() function for running test suites makepkg: add option to clear buildflags Declare all local functions static Update copyright years for 2011 Use size_t for alpm_list sizes repo-add: only attempt to create deltas when asked makepkg: error on invalid optdepends makepkg: initialize local arrays to empty Add a hash table for holding packages Read pkgcache into hash Error handling for maximum database size Slightly more efficient rehash size selection Rehash efficiently Refactor finding position for new hash entry Actually remove packages from pkghash on removal makepkg: more bash-3.2 compatibility pactest for removing a required empty directory Do not print warning with files entry in sync db Document API changes for pacman-3.5 release Update NEWS for pacman-3.5 release Andres P (18): makepkg: use type -p's return value for PATH checks makepkg: use double brackets makepkg: use single redirection when writing PKGINFO makepkg: use printf when writing pkginfo makepkg: fix variable checks when writing pkginfo makepkg: use "declare -f" to test for function presence makepkg: less code repetition for empty variable checking makepkg: add to variables without expanding them makepkg: merge in-line splitpkg handling logic makepkg: fix inconsistent output when checking dependencies makepkg: use parameter expansion instead of basename libalpm: compare pkgname with strcoll makepkg: remove unnecessary use of sort makepkg: fix regression in split package function checking makepkg: undeclared local variables makepkg: less code duplication in create_package makepkg: do not ignore errors from pacman when checking deps makepkg: remove dead code from handle_deps Bruno Widmann (1): Abort db_populate if dbpath is not set Carlos Diaz (2): bash_completion: remove upstream deprecated functions makepkg: use portable escape sequence for terminal escapes Cedric Staniewski (2): makepkg: fix indention to follow style guide makepkg: make SRCPKGDEST default to $startdir Dan McGee (212): Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' Use the plural features of gettext Enable libfetch connection caching fgets invocation cleanup Merge branch 'maint' makepkg: remove trailing quote mark in regex Merge branch 'maint' Merge branch 'maint' libalpm md5: use larger and dynamic buffer Use OpenSSL MD5 crypto functions if available Clean up libfetch checking in configure Merge branch 'maint' Fix libfetch configure checking Restore trimming of db and pkg extensions Remove quotes in remaining bash regexes Merge branch 'maint' Update gettext Makefiles to 0.18 Clean up root .gitignore Update config.guess and config.sub Update more supplementary build scripts Update build system (automake, autoconf, libtool) Merge branch 'build-system' Merge branch 'maint' Merge branch 'maint' Avoid stat call to determine is_directory if possible Remove use of `seq` in pactree Only check for function if we are using libfetch util: fall cleaning on single file programs contrib/ follow-up work Unify caching concerns in package accessors Allow local and sync db to be treated separately Complete rework of package accessor logic Move changelog functions to callback struct Move the cache stuff where it should be Initial hack at a DB operations struct Fix bash shell location check Merge remote branch 'allan/backend' Small tweaks after backend merge Add epoch support to pacman/libalpm Update documentation to reflect new epoch package variable Make repo-add and makepkg epoch-aware Add epoch support to pactest Update contrib/ for epoch Add epoch verification to makepkg Add several pactests for epoch code Merge branch 'maint' Merge branch 'maint' Merge branch 'maint' Ensure stdin args are correctly terminated src/util: update .gitignore dirent usage cleanup Remove AC_TYPE_SIGNAL usage Refactor statfs/statvfs type check diskspace style cleanups and small fixes Make reading from any file possible in sync DB Turn libarchive warnings into libalpm warnings Attempt to stop installation when we encounter problems pacman-optimize: ensure database directory contains local/ Create sync/ DB directory if it does not exist Update scripts/ .gitignore Mark sync_db_read() as static Remove non-public functions from header Abstract has_scriptlet() to package ops struct Correctly force load of package reason Use _alpm_pkg_find in deps search Add hash_sdbm function When setting package name, set hash value as well Used hashed package name in _alpm_pkg_find Reorganize fields in package struct Add a cushion for diskspace checking Merge branch 'maint' Use macros in sync DB parsing testdb: update for new database format Overhaul archive fgets function pactest: allow testing of package description Add pactest to test long archive reads Remove need for memory allocation in _alpm_depcmp Use name hashes in depends to avoid strcmp calls Merge branch 'fgets-perf' Merge branch 'depcmp-perf' Merge branch 'maint' Merge branch 'maint' Fix function indentation pactest: remove dead function pactest: Use booleans where it makes sense Remove FORCE reading from local DB vercmp: always return 0 if we perform a compare Refactor old date parsing into single method Fix some more simple conversion "errors" Remove need for floating point division in backend Ensure we use local package when calculating removed size Progress callback cleanups and fixes Use double rather than float everywhere pactest: correctly write epoch and force as necessary repo-add: use pushd/popd pactest: build the filelist using a set() Add two pactests with non-trivial file counts doc: add docs for repo-add -d option Small fix to download size lookup and a logger Add a progressbar for package integrity checking Unify two free diskspace error messages Add error message stating which partition is full Call archive_read_data_skip() while checking diskspace Fix double filelist issue when upgrading a package Merge branch 'repo-add-improvements' Merge branch 'fix-double-load' Merge branch 'diskspace-fixes' Merge branch 'maint' repo-add: fix misguided conditional correction makepkg: perform all sanity checks before erroring out Fix integrity check status when installing from file Add a pactest for the situation in FS#7524 Update valgrind suppressions file Add strndup fallback function to libalpm util Improve depends string parsing Improve splitname memory allocation Add a likely_pkg hint argument to sync_db_read pactest: Rename epoch pactests pactest: add more testing for epoch Allow version comparison to contain epoch specifier Remove epoch as an independent field makepkg: encode epoch in version specifier if > 0 doc: add a vercmp manpage doc: update current list of authors Merge branch 'epoch-work' Merge branch 'maint' Compute download size for sync packages only pactest: pylint changes for pmfile pactest: pylint changes for pactest pactest: pylint changes for pmenv pactest: pylint changes for pmrule pactest: pylint changes for pmpkg pactest: pylint changes for pmtest pactest: pylint changes for util pactest: pylint changes for pmdb Modify all pactests to not use PKG_MODIFIED pactest: revamp modified logic Refactor backup file status check into separate function Mark backup status strings as untranslated Be smarter about failure to read backup file contents pactest: use new-style python classes pactest: sort repos by alpha order in config file Add a few new provides tests Merge branch 'backup-status' Improve mbasename performance Query fileowner performance improvements Update contrib/ Makefile pkgsearch: handle non-matching lines gracefully Fix memory leak and error code in DB reading Fix libtool performance regression with many arguments Enable failure on server error for curl download command Ignore known but unused package descfile fields Remove need to explicitly register the local DB pactest: pass entire test to rule.check() Merge branch 'maint' Call count() once in callback pactest: allow checking for cache file existence Add three clean cache tests Style cleanups in clean cache code Allow both cleanmethod values to be specified at the same time Fix locale.h/setlocale inclusion with --disable-nls Get estimated package count when populating databases Implement a quick and dirty rehash function Change default sync hash table sizing to 66% full Add a new removal smoke test Add new alpm_list_remove_item() function Use alpm_list_remove_item in pkghash_remove Improve pkghash_remove algorithm Ensure found files are actually files Add more error checking and logging Merge remote-tracking branch 'allan/hash' Add comment about download file resolution Update translation file indexes and Makevars Add updated Kazakh translation from Transifex Add new translations from Transifex Merge branch 'maint' Skip diskspace checking for symlinks and directories in all cases Ensure pkgbase/epoch are defined before doing anything Fix fileconflict progress with only one package Avoid a memmove by advancing value pointer Fix mount dir length calculation diskspace: use calloc instead of malloc Check mountpoint read-only status when checking space diskspace: allow used flag to be toggled for both remove and install Fix some database size estimation problems Conflict checking code cleanup Don't generate filelist unless we are going to use it Remove trans->skip_add Mark log callback format string const Various small spelling fixes and small tweaks Continue resolving dependencies rather than bailing on first error Add test case for util-linux/util-linux-ng name switch and deps Add directory name to ownership error message Add base transifex client configuration Fix trans no-argument function definitions Move locking functions to where they are needed Check local DB version before continuing transaction Update translation instructions Merge branch 'maint' Update translation template files Fix some easy to find double translations Ensure d_type is not DT_UNKNOWN before relying on it pactest: use actual regexes in OUTPUT rules Fix gettext plural detection Fix value of ngettext() count parameter in callback Updated translations for 3.5.0 from Transifex contrib/Makefile.am: don't simplify what you don't understand Bump pacman versions Dave Reisner (5): Support reading package args from stdin pactree: rewrite in C makepkg: escape closing bash array paren for awk alpm: remove public visibility of pmpkghash_t alpm: alpm_db_get_pkgcache_list => alpm_db_get_pkgcache Eric Bélanger (1): makepkg: Place source packages symlinks in build dir when SRCPKGDEST is used Florian Pritz (1): make -d less strict; add -dd option Jakob Gruber (8): CLI args: add pactest with an invalid combination CLI args: reorganize parsing CLI args: stricter/better parsing Tests: Sync group which includes ignored pkgs Tests: '-S repo/group' syntax Add const to some ALPM function signatures A couple of minor manpage adjustments --print-format displays size in bytes Jonathan Conder (3): redirect scriptlet stderr synchronously through alpm use execv to avoid using sh just to run ldconfig Fix double close of the lock file Jürgen Hötzel (1): Use pipe to create compressed package instead of an intermediate tar file Nezmer (5): makepkg: Extract from any file bsdtar can recognize makepkg: Use mkfifo instead of GNU-only 'mknod <file> p' Add .in extension to files in contrib Use sysconfdir, localstatedir, BASH instead of hardcoded values makepkg: Fix the check for references to srcdir/pkgdir Nico Schottelius (1): manpage: add real world examples Pang Yan Han (5): Handle PM_ERR_WRITE in alpm_strerror() Remove redundant _alpm_strtrim() in be_local.c Handle null pkgcache for local/sync db_populate() Refactor out common code in pkghash add functions Use CALLOC for _alpm_graph_new() PyroPeter (1): repo-add: Create/modify files databases Sebastian Nowicki (1): Set pm_errno on libarchive errors while reading Thomas Bächler (2): makepkg: Allow creation of uncompressed packages libalpm: Fix a missing "nicht" (not) in German translation. Xavier Chantry (37): pactest: use simpler method to create tar pactest: fix gensync pactest: fix typo in ignore001 repo-add: add delta generation repo-add: more informative delta messages be_package: read force entry and convert to epoch pactest: use valgrind.supp file Fix a few problems reported by clang-analyzer alpm: add new alpm_find_satisfier function pacman/deptest: reimplement with alpm_find_satisfier alpm: kill alpm_deptest alpm: don't expose alpm_depcmp CLI args: update --help and manpage pacman: sort --help output alpm/remove.c : respect --dbonly during remove-upgrade pactree: separate dependency and print logic pactree: use variables for color and tree output contrib: remove bash pactree libalpm/be_package.c: fix small memleak Makefile: Use git describe --dirty for GIT VERSION Add interactive provider selection alpm/dep: add alpm_find_dbs_satisfier alpm: new alpm_add_pkg interface alpm: add alpm_find_grp_pkgs pacman/sync: rewrite target handling alpm: new alpm_remove_pkg interface pacman/upgrade: switch to new interface pacman/remove: switch to new alpm_remove_pkg interface alpm: deprecate old interface pacman/sync: implement interactive group selection pacman: improve select-question select_display: per-database output alpm: drop old target interfaces libalpm: fix db_update documentation add pactests for -Sdd alpm/depcmp: new NODEPVERSION flag libalpm/diskspace.c: remove bogus parenthesis ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0