- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Ensure we have a root partition when checking space
by Dan McGee 17 Mar '11

17 Mar '11

Partially addresses the "why doesn't CheckSpace work in a chroot" issue. We can't make it work, but we can at least detect when it won't work by the lack of a root partition to bucket the stragglers into. Check the last item in the mountpoint list to ensure it is our root device, and if not, bail out with an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint? Allan, Eric, enjoy, I think this should help address things, but testing it out in a chroot would be much appreciated. -Dan lib/libalpm/diskspace.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c index 892b1aa..19eaeea 100644 --- a/lib/libalpm/diskspace.c +++ b/lib/libalpm/diskspace.c @@ -61,7 +61,7 @@ static int mount_point_cmp(const void *p1, const void *p2) static alpm_list_t *mount_point_list(void) { - alpm_list_t *mount_points = NULL; + alpm_list_t *mount_points = NULL, *ptr; alpm_mountpoint_t *mp; #if defined HAVE_GETMNTENT @@ -124,6 +124,10 @@ static alpm_list_t *mount_point_list(void) mount_points = alpm_list_msort(mount_points, alpm_list_count(mount_points), mount_point_cmp); + for(ptr = mount_points; ptr != NULL; ptr = ptr->next) { + mp = ptr->data; + _alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir); + } return(mount_points); } @@ -256,6 +260,7 @@ cleanup: int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) { alpm_list_t *mount_points, *i; + alpm_mountpoint_t *last; size_t replaces = 0, current = 0, numtargs; int abort = 0; alpm_list_t *targ; @@ -266,6 +271,13 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local) _alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points")); return(-1); } + /* due to sorting, the last entry in our mountpoint list should be '/' */ + i = alpm_list_last(mount_points); + last = i->data; + if(strcmp("/", last->mount_dir) != 0) { + _alpm_log(PM_LOG_ERROR, _("could not determine root filesystem mount")); + return(-1); + } replaces = alpm_list_count(trans->remove); if(replaces) { -- 1.7.4.1

4 4

[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