- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Update zsh completion.
by Nathan Jones 06 Dec '07

06 Dec '07

Update zsh completion file to version 0.5-2 from AUR and add the new options in pacman 3.1. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- contrib/zsh_completion | 85 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 64 insertions(+), 21 deletions(-) diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 07cd422..f6cd900 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -1,6 +1,6 @@ -# file: /usr/share/zsh/site-functions/_pacman -# use the following in your zsh config: -# compdef pacman pacman.static=pacman +#compdef pacman pacman.static=pacman + +# copy this file to /usr/share/zsh/site-functions/_pacman typeset -A opt_args @@ -21,11 +21,15 @@ _pacman_opts_common=( '-h[Display syntax for the given operation]' '-r[Set alternate installation root]:installation root:_files -/' '-v[Be more verbose]' + '--cachedir[Alternate package cache location]:cache_location:_files -/' '--config[An alternate configuration file]:config file:_files' + '--logfile[An alternate log file]:config file:_files' '--noconfirm[Do not ask for confirmation]' + '--noprogressbar[Do not show a progress bar when downloading files]' + '--noscriptlet[Do not execute the install scriptlet if one exists]' ) -# options for passing to _arguments: options for --add, and --update commands +# options for passing to _arguments: options for --add and --update commands _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' @@ -43,8 +47,16 @@ _pacman_opts_query_actions=( # options for passing to _arguments: options for --query and subcommands _pacman_opts_query_modifiers=( + '-c[List package changelog]' + '-d[List packages installed as dependencies]' + '-e[List packages explicitly installed]' + '-g[List all members of a package group]' '-i[View package information]' + '-ii[View package information including backup files]' '-l[List package contents]' + '-m[List installed packages not found in sync db(s)]' + '-t[List packages not required by any package]' + '-u[List packages that can be upgraded]' ) # options for passing to _arguments: options for --remove command @@ -60,6 +72,7 @@ _pacman_opts_remove=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( '*-c[Remove old packages from cache]:*:clean:->sync_clean' + '*-cc[Remove all packages from cache]:*:clean:->sync_clean' '-g[View all members of a package group]:*:package groups:->sync_group' '-s[Search package names and descriptions]:*:search text:->sync_search' ) @@ -67,6 +80,7 @@ _pacman_opts_sync_actions=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_modifiers=( '-d[Skip dependency checks]' + '-e[Install dependencies only]' '-f[Overwrite conflicting files]' '-i[View package information]' '-l[List all packages in a repository]' @@ -76,6 +90,7 @@ _pacman_opts_sync_modifiers=( '-y[Download fresh package databases]' '*--ignore[Ignore a package upgrade]:package:_pacman_completions_installed_packages' '*--ignoregroup[Ignore a group upgrade]:package group:_pacman_completions_all_groups' + '--asdeps[Install packages as non-explicitly installed]' ) # handles --action subcommand @@ -209,43 +224,57 @@ _pacman_action_version() { _pacman_completions_all_groups() { local -a cmd groups _pacman_get_command - groups=( $(_call_program groups $cmd[@] -Sg | grep -e \^$PREFIX) ) + groups=( $(_call_program groups $cmd[@] -Sg) ) compadd "$@" -a groups } # provides completions for packages available from repositories +# these can be specified as either 'package' or 'repository/package' _pacman_completions_all_packages() { - local -a cmd packages repositories + local -a cmd packages repositories packages_long - repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | sort -u) ) - # these can be specified as either 'package' or 'repository/package' - if [[ "$PREFIX" == "" ]] ; then - packages=( $(_call_program packages ls /var/lib/pacman/sync/${^repositories} | grep -v "^/" | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted packages expl "packages" compadd - "${(@)packages}" + if [[ $PREFIX != */* ]] ; then + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + typeset -U repositories + _wanted repo_packages expl "repository/package" compadd -S "/" $repositories else - packages=( $(_call_program packages ls /var/lib/pacman/sync/${^repositories} | grep -v "^/" | grep -e \^$PREFIX | sed "s,\-[^-]*\-[^-]*$,," | sort -u) ) + compset -P '*/' + packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + typeset -U packages + _wanted repo_packages expl "repository/package" compadd ${(@)packages} fi - compadd "$@" -a packages } # provides completions for package groups _pacman_completions_installed_groups() { local -a cmd groups _pacman_get_command - groups=( $(_call_program installed_groups $cmd[@] -Qg | cut -d' ' -f1 | grep -e \^$PREFIX | sort -u) ) + groups=(${(o)${(f)"$(pacman -Qg)"}% *}) + typeset -U groups compadd "$@" -a groups } # provides completions for installed packages _pacman_completions_installed_packages() { - local -a cmd packages - packages=( $(_call_program installed_packages ls /var/lib/pacman/local | grep "^$PREFIX" | sed "s,\-[^-]*\-[^-]*$,,") ) + local -a cmd packages packages_long + packages_long=(/var/lib/pacman/local/*(/)) + packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) compadd "$@" -a packages } # provides completions for repository names _pacman_completions_repositories() { local -a cmd repositories - repositories=( $(_call_program repositories cat /etc/pacman.conf | grep "^\[" | sed "s,$\[\|\]$,,g" | grep -v "^options" | grep "^$PREFIX" | sort -u) ) + repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + # Uniq the array + typeset -U repositories compadd "$@" -a repositories } @@ -265,21 +294,32 @@ _pacman_get_command() { # main dispatcher _pacman() { + # First check if --ignoregroup was the last command given. If so, complete + # all groups. + if [ "$words[-2]" = "--ignoregroup" ]; then + _arguments -s : \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_sync_modifiers[@]" \ + '*:package group:_pacman_completions_all_groups' + return 0 + fi + + # Otherwise, complete on the given command. case $words[2] in -A*) _pacman_action_add ;; - -Qg) # ipkg groups + -Q*g*) # ipkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:groups:_pacman_completions_installed_groups' ;; - -Qo) # file *.pkg.tar.gz + -Q*o*) # file *.pkg.tar.gz _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files' ;; - -Qp) # file *.pkg.tar.gz + -Q*p*) # file *.pkg.tar.gz _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ @@ -287,13 +327,16 @@ _pacman() { ;; -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; - -Sl) # repos + -S*c*) # no completion + return 0 + ;; + -S*l*) # repos _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ '*:package repo:_pacman_completions_repositories' \ ;; - -Sg) # pkg groups + -S*g*) # pkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_sync_modifiers[@]" \ -- 1.5.3.7

3 5

[pacman-dev] ignore question asked twice
by Xavier 05 Dec '07

05 Dec '07

On Tue, Dec 04, 2007 at 01:19:44PM +0100, Nagy Gabor wrote: > 3. commit 55a7455135e2d8f2e118928f634dc7976ab6c8b4 and asymmetric > search-for-satisfier caused a strange situation: > # pacman -S foo --ignore foo-dependency > "install foo-dependency anyway?" is asked twice, if this foo-dependency is a > literal satisfier, because in the search-for-provisions we use alpm_depcmp, > which finds literals again... Uh, I thought I couldn't reproduce this, because I was answering the default question (yes). Now I see, but I don't consider this to be a big problem. Why would you answer no to the question anyway? When you do, pacman will just fail.

2 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-656-g9615d82
by Dan McGee 05 Dec '07

05 Dec '07

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 9615d82343148301884bfc79d87e2f408aad64bd (commit) via 87d95f14f70cc133642db3041a2b3e78b5a74516 (commit) via afdf3724d9d5672c07adcf474d2850630e605167 (commit) via 874f3379ffe75582882a48b5d6b6533659750e7c (commit) via 665b61082ee52975e2dba657955e962ae5422a1e (commit) via f42e22338683b1478412a64a83bbffd6b1776aa0 (commit) via d6354ff248968a1eb1f3ac78441660d4c7a95b86 (commit) via 72dae726910bce78647fb47ccfbba657b229ffb4 (commit) via 0d1cb037566f3327315cf946d2443abb114b623a (commit) from f07a800fab2192dd64957bf2a30c71f6ccbe3592 (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 9615d82343148301884bfc79d87e2f408aad64bd Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Wed Dec 5 09:50:29 2007 +1000 Compress hard linked man pages This fixes FS#5392. If hard links are present for a man page, all other hard linked files are removed, the man page is zipped and the hard links are updated to the newly compress man page. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: use find -samefile option, don't fail if one of mandirs is nonexistent] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87d95f14f70cc133642db3041a2b3e78b5a74516 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Dec 5 00:28:36 2007 +0100 libalpm/backup.c : simple refactoring. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit afdf3724d9d5672c07adcf474d2850630e605167 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Tue Dec 4 21:31:37 2007 +0100 Updated Italian translation for pacman 3.1 Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> modified: po/it.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 874f3379ffe75582882a48b5d6b6533659750e7c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 4 09:56:28 2007 -0600 Update some errors in messages found during localization Also perform the updates in the message files so we don't break translations. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 665b61082ee52975e2dba657955e962ae5422a1e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Dec 4 12:27:03 2007 +0100 Updated Hungarian translation Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f42e22338683b1478412a64a83bbffd6b1776aa0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:50:33 2007 -0600 pacman/sync.c: mark sync_trans as static Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6354ff248968a1eb1f3ac78441660d4c7a95b86 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:17:19 2007 -0600 Oops- forgot to ever set init to 1 in setlibpaths() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72dae726910bce78647fb47ccfbba657b229ffb4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Dec 3 22:57:54 2007 +0100 Delay output during progress bar This fixes the output issue related to the progress bar by delaying the output. We can decide later (post-release) if we like this method or we want to switch to something else. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: just some minor cleanups] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d1cb037566f3327315cf946d2443abb114b623a Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Mon Dec 3 11:50:55 2007 +0100 Update it translation for 3.1 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/backup.c | 65 ++++++++++++--- lib/libalpm/backup.h | 2 + lib/libalpm/po/it.po | 59 +++++++------- po/de.po | 4 +- po/en_GB.po | 8 +- po/es.po | 4 +- po/fr.po | 4 +- po/hu.po | 170 ++++++++++++++++++---------------------- po/it.po | 210 ++++++++++++++++++++++-------------------------- po/pl_PL.po | 4 +- po/pt_BR.po | 4 +- po/ru_RU.po | 4 +- scripts/makepkg.sh.in | 40 +++++++--- src/pacman/callback.c | 32 +++++++- src/pacman/pacman.c | 5 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 35 ++++++++ src/pacman/util.h | 1 + 18 files changed, 368 insertions(+), 285 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.0.6-656-g9615d82
by Dan McGee 05 Dec '07

05 Dec '07

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 9615d82343148301884bfc79d87e2f408aad64bd (commit) via 87d95f14f70cc133642db3041a2b3e78b5a74516 (commit) via afdf3724d9d5672c07adcf474d2850630e605167 (commit) via 874f3379ffe75582882a48b5d6b6533659750e7c (commit) via 665b61082ee52975e2dba657955e962ae5422a1e (commit) via f42e22338683b1478412a64a83bbffd6b1776aa0 (commit) via d6354ff248968a1eb1f3ac78441660d4c7a95b86 (commit) via 72dae726910bce78647fb47ccfbba657b229ffb4 (commit) via 0d1cb037566f3327315cf946d2443abb114b623a (commit) from f07a800fab2192dd64957bf2a30c71f6ccbe3592 (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 9615d82343148301884bfc79d87e2f408aad64bd Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Wed Dec 5 09:50:29 2007 +1000 Compress hard linked man pages This fixes FS#5392. If hard links are present for a man page, all other hard linked files are removed, the man page is zipped and the hard links are updated to the newly compress man page. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: use find -samefile option, don't fail if one of mandirs is nonexistent] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 87d95f14f70cc133642db3041a2b3e78b5a74516 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Wed Dec 5 00:28:36 2007 +0100 libalpm/backup.c : simple refactoring. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit afdf3724d9d5672c07adcf474d2850630e605167 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Tue Dec 4 21:31:37 2007 +0100 Updated Italian translation for pacman 3.1 Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> modified: po/it.po Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 874f3379ffe75582882a48b5d6b6533659750e7c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 4 09:56:28 2007 -0600 Update some errors in messages found during localization Also perform the updates in the message files so we don't break translations. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 665b61082ee52975e2dba657955e962ae5422a1e Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Dec 4 12:27:03 2007 +0100 Updated Hungarian translation Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f42e22338683b1478412a64a83bbffd6b1776aa0 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:50:33 2007 -0600 pacman/sync.c: mark sync_trans as static Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d6354ff248968a1eb1f3ac78441660d4c7a95b86 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 3 22:17:19 2007 -0600 Oops- forgot to ever set init to 1 in setlibpaths() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 72dae726910bce78647fb47ccfbba657b229ffb4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Dec 3 22:57:54 2007 +0100 Delay output during progress bar This fixes the output issue related to the progress bar by delaying the output. We can decide later (post-release) if we like this method or we want to switch to something else. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> [Dan: just some minor cleanups] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0d1cb037566f3327315cf946d2443abb114b623a Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Mon Dec 3 11:50:55 2007 +0100 Update it translation for 3.1 Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/backup.c | 65 ++++++++++++--- lib/libalpm/backup.h | 2 + lib/libalpm/po/it.po | 59 +++++++------- po/de.po | 4 +- po/en_GB.po | 8 +- po/es.po | 4 +- po/fr.po | 4 +- po/hu.po | 170 ++++++++++++++++++---------------------- po/it.po | 210 ++++++++++++++++++++++-------------------------- po/pl_PL.po | 4 +- po/pt_BR.po | 4 +- po/ru_RU.po | 4 +- scripts/makepkg.sh.in | 40 +++++++--- src/pacman/callback.c | 32 +++++++- src/pacman/pacman.c | 5 +- src/pacman/sync.c | 2 +- src/pacman/util.c | 35 ++++++++ src/pacman/util.h | 1 + 18 files changed, 368 insertions(+), 285 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Compress hard linked man pages
by Allan McRae 05 Dec '07

05 Dec '07

Hi all, The attached patch fixes FS#5392 [1]. If hard links are present for a man page, all other hard linked files are removed, the man page is gzipped and the hard links are updated to the newly compressed man page. I didn't deal with the comment the .bz2 files are not change because I felt that is unnecessary. Also, do we even care if man pages have permission of 444 instead of 644 as mentioned in the final comment? From the comments in the bug report, the ownership of the traceroute man page should probably be dealt with in the iputils package and probably needs a separate bug report opened. This is the first patch I've submitted and I'm new to git so let me know if I've done something wrong... Cheers, Allan [1] http://bugs.archlinux.org/task/5392

5 11

[pacman-dev] [PATCH] Updated Italian translation for pacman 3.1
by Giovanni Scafora 04 Dec '07

04 Dec '07

Hi guys, here's my updated Italian translation for pacman 3.1 Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

[pacman-dev] output issues status
by Xavier 04 Dec '07

04 Dec '07

So, a while ago I reported some output issues here, making the distinction between two kind : http://www.archlinux.org/pipermail/pacman-dev/2007-September/009317.html The first kind was worked around by Dan by removing these pointless "done" messages : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=3017b71cb5cde3ae… For the second one, Dan and Aaron had an argument about how to solve it. Dan has a preference for delaying the output, and Aaron prefers padding with space (the way it was in 3.0). 22:56 phrakture >> i don't get why you dislike padding with spaces. lots of other apps do that 22:57 phrakture >> i personally think it's a far better idea than blocking message output 22:57 phrakture >> because, well, what if we have a front end that doesn't output progress 22:57 phrakture >> and thus has no progress callback 22:59 toofishes >> we aren't blocking message output *from the backend* 22:59 toofishes >> this is all in the frontend! 23:00 toofishes >> if you had an install where there were 20 permission errors, we are going to have 20 progress bar fragments right now. 23:00 phrakture >> right, and I'm saying we can solve that with maybe 3 lines of code 23:00 toofishes >> ok, patches welcome :) 23:00 phrakture >> but it's padding, and you dislike that 23:01 toofishes >> well i haven't seen your implementation. maybe i won't dislike it. 23:01 toofishes >> i just feel like this isn't the right way or something. Since Aaron promised restoring the padding way in 3 lines, I couldn't really compete with that ;), and besides 3.0 already has a sample implementation. So I tried exploring the delayed output way instead, and hacked something together in ~50 lines. It's very ugly and hackish, but it's just meant as a proof of concept, because I'm not even sure the idea is right. >From 9de58523ee64c4c2d86148fad30be1c6cf543d22 Mon Sep 17 00:00:00 2001 From: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon, 3 Dec 2007 22:57:54 +0100 Subject: [PATCH] Delay output during progress bar. This is just a proof of concept patch to fix the output issue related to the progress bar by delaying the output. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/callback.c | 27 ++++++++++++++++++++++++++- src/pacman/util.c | 29 +++++++++++++++++++++++++++++ src/pacman/util.h | 1 + 3 files changed, 56 insertions(+), 1 deletions(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 6129d8d..7d52f5d 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -48,6 +48,10 @@ static struct timeval initial_time; /* transaction progress bar ? */ static int prevpercent=0; /* for less progressbar output */ +/* delayed output */ +static int on_progress = 0; +static alpm_list_t *output = NULL; + /* Silly little helper function, determines if the caller needs a visual update * since the last time this function was called. * This is made for the two progress bar functions, to prevent flicker @@ -408,6 +412,19 @@ void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, /* call refactored fill progress function */ fill_progress(percent, percent, getcols() - infolen); + + if(percent == 100) { + alpm_list_t *i = NULL; + on_progress = 0; + for(i = output; i; i = i->next) { + printf("%s", (char *)i->data); + } + alpm_list_free_inner(output, free); + alpm_list_free(output); + output = NULL; + } else { + on_progress = 1; + } } /* callback to handle display of download progress */ @@ -546,7 +563,15 @@ void cb_log(pmloglevel_t level, char *fmt, va_list args) return; } - pm_vfprintf(stdout, level, fmt, args); + if(on_progress) { + char *string = NULL; + pm_vasprintf(&string, level, fmt, args); + if(string != NULL) { + output = alpm_list_add(output, string); + } + } else { + pm_vfprintf(stdout, level, fmt, args); + } } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/util.c b/src/pacman/util.c index 89313c8..78b6fcf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -526,6 +526,35 @@ int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) return(ret); } +int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args) +{ + int ret = 0; + char *msg = NULL; + + /* if current logmask does not overlap with level, do not print msg */ + if(!(config->logmask & level)) { + return ret; + } + + /* print the message using va_arg list */ + ret = vasprintf(&msg, format, args); + + /* print a prefix to the message */ + switch(level) { + case PM_LOG_ERROR: + asprintf(string, _("error: %s"), msg); + break; + case PM_LOG_WARNING: + asprintf(string, _("warning: %s"), msg); + break; + default: + break; + } + free(msg); + + return(ret); +} + int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) { int ret = 0; diff --git a/src/pacman/util.h b/src/pacman/util.h index 0295d7e..4f4b3db 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -55,6 +55,7 @@ int yesno(char *fmt, ...); int pm_printf(pmloglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_fprintf(FILE *stream, pmloglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_vfprintf(FILE *stream, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); +int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); #ifndef HAVE_STRNDUP char *strndup(const char *s, size_t n); -- 1.5.3.6

3 6

[pacman-dev] [PATCH] Updated Hungarian translation + some issues
by Nagy Gabor 04 Dec '07

04 Dec '07

Hi! I found some issues during localization: 1. typo: msgid " -q --quiet ..." this should be msgid " -q, --quiet ..." 2. strange message: " --needed only install outdated or not yet installed packages\n" No thx, I don't want to install outdated packages. I translated this as 'only "upgrade" outdated or not yet ...' 3. commit 55a7455135e2d8f2e118928f634dc7976ab6c8b4 and asymmetric search-for-satisfier caused a strange situation: # pacman -S foo --ignore foo-dependency "install foo-dependency anyway?" is asked twice, if this foo-dependency is a literal satisfier, because in the search-for-provisions we use alpm_depcmp, which finds literals again... 4. And a bash_completion wishlist: "pacman -Si" and similar "pacman -S comm" <- community/ Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 4

[pacman-dev] Installing outdated packages
by matthias＠archlinux.de 04 Dec '07

04 Dec '07

> On Dec 4, 2007 6:19 AM, Nagy Gabor <ngaba(a)bibl.u-szeged.hu> wrote: >> 2. strange message: >> " --needed only install outdated or not yet installed >> packages\n" >> No thx, I don't want to install outdated packages. I translated this as >> 'only >> "upgrade" outdated or not yet ...' > Good catch, I'll change both of these (where is your patch?). I also had to smile/frown on this. And sorry, Dan - I am not competent enough to provide a patch. But competent enough to start a new thread ... .de version is underway All the best, Matt

3 2

[pacman-dev] Fix reason handling before 3.1 (was: Final steps before 3.1 release)
by Dan McGee 04 Dec '07

04 Dec '07

On Dec 3, 2007 4:47 AM, Nagy Gabor <ngaba(a)bibl.u-szeged.hu> wrote: > Well, the changelog between 3.0.x and 3.1 will be huge and impressive;-) > There are some issues which annoy me a bit: > -sync044.py (but this is only one thing: see > http://www.archlinux.org/pipermail/pacman-dev/2007-September/009271.html for > details) <- %REASON% is one of my favourite libalpm features, and now this is > quite buggy :-( > -FS#8350 > > OK, I don't want to delay this release (imho we should release pacman more > frequently <- but then we should do a message freeze between two major versions > to help to our translators), but I think we should release 3.1.1 soon to fix > these. Or to be precise, these are libalpm (libdownload?) issues, but in AL we > have no separate libalpm package. I think we can get this into 3.1 without a problem, IF we can exactly lay out the problem. From your other email, it looks like we should have a sequence of patches that do the following: 1. Add an --asexplicit option 2. First, determine a REASON policy for things such as installs, upgrades, and syncs including pulling in deps. Second, make a patch that implements this (and has comments in the code and commit msg!) 3. Implement HoldPkg reason (value of 2)? If they aren't already, these should become constants/enums in the code since we now have more than two possibilities. So, in short Nagy- pick what you want to do above and help us get this done. Also, let me know what Aaron or I need to do to help you. -Dan

3 5