- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: always update symlinks to compressed man pages
by Allan McRae 05 Mar '10

05 Mar '10

When a man page has both symbolic and hard links, any symlink pointing to other than the alphabetically first hardlink was not "compressed" and left dangling towards the uncompressed man page. Fixes FS#18569. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3d987ac..f8072f9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -836,17 +836,18 @@ tidy_install() { local manpage ext file link hardlinks hl find ${MAN_DIRS[@]} -type f 2>/dev/null | while read manpage ; do - # check file still exists (potentially compressed with hard link) - if [[ -f ${manpage} ]]; then - ext="${manpage##*.}" - file="${manpage##*/}" - if [[ $ext != gz && $ext != bz2 ]]; then - # update symlinks to this manpage - find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | - while read link ; do - rm -f "$link" - ln -sf "${file}.gz" "${link}.gz" - done + ext="${manpage##*.}" + file="${manpage##*/}" + if [[ $ext != gz && $ext != bz2 ]]; then + # update symlinks to this manpage + find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | + while read link ; do + rm -f "$link" + ln -sf "${file}.gz" "${link}.gz" + done + + # check file still exists (potentially already compressed due to hardlink) + if [[ -f ${manpage} ]]; then # find hard links and remove them # the '|| true' part keeps the script from bailing if find returned an # error, such as when one of the man directories doesn't exist -- 1.7.0.1

1 1

Re: [pacman-dev] [arch-general] [arch-dev-public] Versioned dependency fun...
by Dan McGee 03 Mar '10

03 Mar '10

On Tue, Mar 2, 2010 at 4:40 PM, Xavier Chantry <chantry.xavier(a)gmail.com> wrote: > On Tue, Mar 2, 2010 at 7:32 PM, Pierre Schmitz <pierre(a)archlinux.de> wrote: >> Am Dienstag, 2. März 2010 14:06:57 schrieb Dan McGee: >>> > and here we have another reason to punish anybody using versioned >>> > dependencies. ;-) (of course upstream needs to be hit, too) >>> >>> Blaming this on versioned deps is punishing the messenger; this >>> package wouldn't upgrade without a force option either because the >>> same version comparison is used everywhere... >> >> You did notice the smiley? I know this wasn't fair in this case and not too >> serious. But anyway, I would prefer add the force flag and add the (stupid) >> upstream version instead of making your own up. >> > > The force flag is a big ugly crap. > I find sanitizing upstream version to be much.. saner. > Or figure out a way to have both a sane version for pacman and the > insane upstream version. I was actually thinking about this again and thinking epoch might not be a bad idea- I don't know if I had any legit objection to it before but I can't think of one anymore. If someone is interested in implementing, I'd be for it. -Dan

4 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-125-g1a00ee5
by dan＠archlinux.org 01 Mar '10

01 Mar '10

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 1a00ee5c276785aef70225c2cc951dbb15888ea5 (commit) via d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 (commit) via afb61bb22a9478ec076f77ff0e102e81763191e7 (commit) via 27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a (commit) from 0eadc992400aaad58da5866d23caee01a22e1341 (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 1a00ee5c276785aef70225c2cc951dbb15888ea5 Author: Cedric Staniewski <cedric(a)gmx.ca> Date: Thu Feb 25 23:23:06 2010 +0100 bash_completion: remove absolute utility paths again The location of the used utilities may and does differ between various distributions and therefore absolute paths do not work well. Since the main purpose of its introduction was to avoid side-effects caused by aliases, it is sufficient to disable possible aliases temporarily by preceding the commands with a backslash. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Thu Feb 18 05:18:10 2010 +0100 contrib/*_completion: match *.pkg.tar.* Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit afb61bb22a9478ec076f77ff0e102e81763191e7 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Dec 24 08:09:38 2009 +1000 Do not print installed size when only downloading When using --downloadonly the "Total Installed Size" message is not needed and perhaps misleading. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 27bc2f7eb81566370f9f19f89eb95c6e6c9ec49a Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 19 21:35:13 2010 +0100 Print "there is nothing to do" with NOOP transactions The "local database is up to date" message has been replaced with "there is nothing to do" message. This used with "empty" -S, -R, -U operations too. (Examples: pacman -S ignored_pkg, pacman -Ru needed_pkg.) See FS#17859. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 32 ++++++++++++++++---------------- contrib/zsh_completion | 8 ++++---- src/pacman/remove.c | 1 + src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 1 + src/pacman/util.c | 4 +++- 6 files changed, 26 insertions(+), 22 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] contrib/*_completion: match *.pkg.tar.*
by Pierre Schmitz 01 Mar '10

01 Mar '10

Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> --- contrib/bash_completion | 4 ++-- contrib/zsh_completion | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..a231eb6 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -321,7 +321,7 @@ _pacman () case "${op}" in U) COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) return 0 ;; h|V) @@ -336,7 +336,7 @@ _pacman () $( compgen -f -- "$cur" ) ) elif _instring $mod p; then COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) ) elif _instring $mod u; then COMPREPLY='' return 0 diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 2f43d9b..01b3c44 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -32,7 +32,7 @@ _pacman_opts_common=( _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' - '*:package file:_files -g "*.pkg.tar.gz(.)"' + '*:package file:_files -g "*.pkg.tar.*(.)"' ) # options for passing to _arguments: subactions for --query command @@ -120,7 +120,7 @@ _pacman_action_query() { _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ - '*:package file:_files -g "*.pkg.tar.gz"' + '*:package file:_files -g "*.pkg.tar.*"' ;; query_group) _arguments -s : \ @@ -295,11 +295,11 @@ _pacman() { "$_pacman_opts_query_modifiers[@]" \ '*:package file:_files' ;; - -Q*p*) # file *.pkg.tar.gz + -Q*p*) # file *.pkg.tar.* _arguments -s : \ "$_pacman_opts_common[@]" \ "$_pacman_opts_query_modifiers[@]" \ - '*:package file:_files -g "*.pkg.tar.gz"' + '*:package file:_files -g "*.pkg.tar.*"' ;; -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; -- 1.7.0 -- Pierre Schmitz, https://users.archlinux.de/~pierre

2 1

[pacman-dev] -Qi output corrupted when using screen
by Roman Kyrylych 28 Feb '10

28 Feb '10

Hi! It has been a looong time since I last posted here (or even read the list), so please forgive me if this is a known issue. I have a VPS on Linode and they have a tool called LISH which is a minimal environment that is accessible via logging in via ssh on the _host_. There is a screen session that shows the output from /dev/hvc0 (which is hardware tty in Xen), so you can access your system even if you locked yourself from accessing it via ssh. When doing pacman -Qi in that screen session I get corrupted output like this: <some text from the top of the host's tty buffer goes here first> Feb 2010 12:14:18 AM UTC Install Date : Sun 14 Feb 2010 02:21:13 PM UTC Install Reason : Explicitly installed Install Script : Yes Description : Utility programs used for creating patch files This happens only when doing -Qi. Any ideas about this? And if it's a known issue - how to fix it? -- Roman Kyrylych (Роман Кирилич)

6 16

[pacman-dev] [PATCH] bash_completion: remove absolute utility paths again
by Cedric Staniewski 26 Feb '10

26 Feb '10

The location of the used utilities may and does differ between various distributions and therefore absolute paths do not work well. Since the main purpose of its introduction was to avoid side-effects caused by aliases, it is sufficient to disable possible aliases temporarily by preceding the commands with a backslash. Signed-off-by: Cedric Staniewski <cedric(a)gmx.ca> --- contrib/bash_completion | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..40ef8c0 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -14,7 +14,7 @@ rem_selected () # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) # This removes any options from the list of completions that have # already been specified on the command line. - COMPREPLY=($(/bin/echo "${COMP_WORDS[@]}" | \ + COMPREPLY=($(\echo "${COMP_WORDS[@]}" | \ (while read -d ' ' i; do [ "${i}" == "" ] && continue # flatten array with spaces on either side, @@ -24,20 +24,20 @@ rem_selected () # remove word from list of completions COMPREPLY=(${COMPREPLY/ ${i%% *} / }) done - /bin/echo ${COMPREPLY[@]}))) + \echo ${COMPREPLY[@]}))) return 0 } _available_repos () { - COMPREPLY=( $( compgen -W "$(/bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) + COMPREPLY=( $( compgen -W "$(\grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' )" -- $cur ) ) } _installed_pkgs () { local installed_pkgs - installed_pkgs=$( /bin/ls /var/lib/pacman/local/ ) - COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + installed_pkgs=$( \ls /var/lib/pacman/local/ ) + COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do \echo ${i%-*-*}; done )" -- $cur ) ) } _available_pkgs () @@ -47,16 +47,16 @@ _available_pkgs () # This little change-up removes the find *and* only uses enabled repos local available_pkgs local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_pkgs=$( for r in $enabled_repos; do /bin/echo /var/lib/pacman/sync/$r/*; done ) + enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | \tr -d '[]' ) + available_pkgs=$( for r in $enabled_repos; do \echo /var/lib/pacman/sync/$r/*; done ) COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) } _installed_groups () { local installed_groups - installed_groups=$( /bin/find /var/lib/pacman/local -name desc -exec /bin/sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | /bin/sort -u ) - COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + installed_groups=$( \find /var/lib/pacman/local -name desc -exec \sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | \sort -u ) + COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) } _available_groups () @@ -66,9 +66,9 @@ _available_groups () # This little change-up removes the find *and* only uses enabled repos local available_groups local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_groups=$( for r in $enabled_repos; do /bin/sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | /bin/sort -u; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + enabled_repos=$( \grep '\[' /etc/pacman.conf | \grep -v -e 'options' -e '^#' | tr -d '[]' ) + available_groups=$( for r in $enabled_repos; do \sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | \sort -u; done ) + COMPREPLY=( $( compgen -W "$( for i in $available_groups; do \echo ${i%-*-*}; done )" -- $cur ) ) } ## makepkg completion @@ -126,7 +126,7 @@ _instring () str="${1}" shift 1 for c in "${@}"; do - if [ $(/bin/expr index "${str}" "${c}") -gt 0 ]; then + if [ $(\expr index "${str}" "${c}") -gt 0 ]; then return 0 fi done @@ -193,7 +193,7 @@ _pacman () esac arglen=$(( ${#toparse}-1 )) - for c in $(/bin/seq 0 "${arglen}"); do + for c in $(\seq 0 "${arglen}"); do arg=${toparse:$c:1} [ "${arg}" != "-" ] && mod="${mod}${arg}" done -- 1.7.0

9 13

[pacman-dev] Bash completion
by Cedric Staniewski 25 Feb '10

25 Feb '10

Hi, I just replaced my bash completion file with the git version and noticed it tries to execute /bin/seq and fails because seq is located at /usr/bin/seq. Since I could not find anything in coreutils' changelog file I guess the path was wrong right from the start and should be corrected. The other thing I wonder about (still the same commit[1]) is why the (slower) external echo command is preferred to bash's internal implementation. Thanks, Cedric [1] http://projects.archlinux.org/pacman.git/commit/?id=8b3f5f0ce6dca98ca14cc48…

4 4

[pacman-dev] [PATCH] makepkg: update required programs
by Allan McRae 25 Feb '10

25 Feb '10

Remove getopt, add xz. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 5120feb..3d987ac 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -28,7 +28,7 @@ # makepkg uses quite a few external programs during its execution. You # need to have at least the following installed for makepkg to function: # bsdtar (libarchive), bzip2, coreutils, fakeroot, find (findutils), -# getopt (util-linux), gettext, grep, gzip, openssl, sed, tput (ncurses) +# gettext, grep, gzip, openssl, sed, tput (ncurses), xz # gettext initialization export TEXTDOMAIN='pacman' -- 1.7.0

1 0

[pacman-dev] bug: pacman giving up too fast downloading
by Paul Dufresne 17 Feb '10

17 Feb '10

Well, I have lots of errors while downloading packages with pacman, and almost never while downloading files from Shiretoko Firefox. I have tried many mirrors, that's the same for each. Oh... I use a 56k modem (Intel 536EP Data Fax modem). But even while downloading in Firefox, it sometimes give me the feeling it has stopped downloading for about 40 secs... while pacman seems to give up after about 20 secs. I did not tried yet to download with wget or curl (does pacman use one of them?). Is there a constant I could change in the code, and rebuild it?... I did not download the code of pacman yet.

7 8

[pacman-dev] [PATCH] don't use old packages to satisfy dependencies
by Henning Garus 12 Feb '10

12 Feb '10

Don't use packages which are updated during the current transaction as dependency providers, when computing needed dependencies in resolvedeps. This could lead to new dependencies not being pulled in, in situations like: foo-1 provides bar baz depends on bar foo-2 does not provide bar anymore baz still depends on bar bar is not pulled in because foo-1 is used to satisfy the dependency Signed-off-by: Henning Garus <henning.garus(a)gmail.com> --- This should fix the "phonon bug". I am not entirely happy with this, because I more or less copy the local db (once more) on every call to resolvedeps. Alternatively one could create a joined list from remove and trans->add and give it to checkdeps as remove parameter. This would do what we want (exclude packages which will be upgraded from the list used to compute already satisfied dependencies in checkdeps), but it feels wrong. lib/libalpm/deps.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 46699ac..85d7e24 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -600,6 +600,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, { alpm_list_t *i, *j; alpm_list_t *targ; + alpm_list_t *untouched = NULL; alpm_list_t *deps = NULL; alpm_list_t *packages_copy; @@ -620,11 +621,19 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, on that list */ *packages = alpm_list_add(*packages, pkg); + /* Create a list of local packages which can be used to satisfy deps. + * Don't use packages which are updated in the current transaction */ + for(i = _alpm_db_get_pkgcache(local); i; i = i->next) { + if(!alpm_list_find(handle->trans->add, i->data, _alpm_pkg_cmp)) { + untouched = alpm_list_add(untouched, i->data); + } + } + _alpm_log(PM_LOG_DEBUG, "started resolving dependencies\n"); for(i = alpm_list_last(*packages); i; i = i->next) { pmpkg_t *tpkg = i->data; targ = alpm_list_add(NULL, tpkg); - deps = alpm_checkdeps(_alpm_db_get_pkgcache(local), 0, remove, targ); + deps = alpm_checkdeps(untouched, 0, remove, targ); alpm_list_free(targ); for(j = deps; j; j = j->next) { pmdepmissing_t *miss = j->data; @@ -666,6 +675,7 @@ int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *pkg, alpm_list_free_inner(deps, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(deps); } + alpm_list_free(untouched); alpm_list_free(packages_copy); _alpm_log(PM_LOG_DEBUG, "finished resolving dependencies\n"); return(0); -- 1.6.6.1

2 1