March 2013 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-639-g41ef7ef
by allan＠archlinux.org 09 Mar '13

09 Mar '13

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 41ef7eff75a0935098358287e1ea88c032c9ba44 (commit) via 0e5c22e7a1c1ef78607121031208f6cc0ffb86e1 (commit) via 0d4ecae6252359fccf706210bececc943fb4fee3 (commit) via 1b78e2bb1af03e6e5245ebe1399222d0f1bfea49 (commit) via 8fd62a39b5d7cb7b8fd73bdfc5dc1ef55f445091 (commit) via 704ab17a6abd22a9c7036051fd72c1fa09841073 (commit) via 8db7e0c98d4eab0bfa119d5ecf209e8a21b4bbaf (commit) via e43c2716504ca0ac8f8f5deedbeb2c3215326558 (commit) from c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 (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 41ef7eff75a0935098358287e1ea88c032c9ba44 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:30 2013 -0500 zsh completion: add support for all longopts commands add all the longopts for the operations and allow for them to be completed just like shortopts Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0e5c22e7a1c1ef78607121031208f6cc0ffb86e1 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:29 2013 -0500 zsh completion: include flags that can be doubled include the flags that could be doubled up like -Sii -Syy -Suu -Qii etc also include the long opts of all the commands Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0d4ecae6252359fccf706210bececc943fb4fee3 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Fri Mar 8 15:59:28 2013 -0500 zsh completion: fix doubling up of specific variables -i -y -u -d -s etc, so that they do not disappear In the future I hope there is an easy way to limit it to just 2, right now the *- makes it so that it can be added as many times as you want. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1b78e2bb1af03e6e5245ebe1399222d0f1bfea49 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Thu Mar 7 01:59:24 2013 -0500 zsh completion: add --color to completion Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8fd62a39b5d7cb7b8fd73bdfc5dc1ef55f445091 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 16:10:25 2013 -0500 zsh completion: make sure all indentions are tabs Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 704ab17a6abd22a9c7036051fd72c1fa09841073 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 16:04:00 2013 -0500 zsh completion: use consistent case statement style Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8db7e0c98d4eab0bfa119d5ecf209e8a21b4bbaf Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 15:41:29 2013 -0500 zsh completion: fix stacked completion Before this, if you do pacman -Sy<tab> it completes to -y. Now, with -S and the other operations in the actual option _arguments, it won't remove the operations. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e43c2716504ca0ac8f8f5deedbeb2c3215326558 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Wed Mar 6 15:41:12 2013 -0500 zsh completion: add deptest and database Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/zsh_completion.in | 645 +++++++++++++++++++++++++++------------------- 1 file changed, 381 insertions(+), 264 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.3-631-gc9b7f9b
by allan＠archlinux.org 09 Mar '13

09 Mar '13

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 c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 (commit) via 0ff57350fbf359c9f0a6700da1f91250a1f9a239 (commit) via 43a2f6319455edadf9947d2e0fa9e68ea4e348ae (commit) via 2259dff7f34b082d8e43af15228e74cba75580f6 (commit) via 93fa63ee8a7f17bea676ac4f29d1733cb04ef7d2 (commit) via fcdaa46b651904fb88ea325d014bd85edd8a08fe (commit) via 06d761a0207d579d4976a8c61257516c2b368911 (commit) via ce9fd69eba44d997a660c982a8149fae7acb6a29 (commit) via 9876d9783979ec031d673e9a6df845e52fd2febb (commit) via 51276f1ac5fd337a8bffbda3099c0bd86b6503cf (commit) via 08a1244f4ef952be0c4897b9c5fee12a214be3f9 (commit) from d90641a894b915f5e13876bba88aa765c9961b0a (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 c9b7f9b0d0a85a8106d144edfdf3d22a7f7f9802 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:59:33 2013 -0500 testdb: quote output substitutions Quoting output substitutions makes whitespace errors such as FS#30101 much more obvious: old: missing perl-test-pod dependency for perl-test-output new: missing 'perl-test-pod ' dependency for 'perl-test-output' Several of the quoted substitutions should not be capable of containing whitespace in theory, but this errs on the side of caution as the point of the tool is to find error conditions. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0ff57350fbf359c9f0a6700da1f91250a1f9a239 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:59:32 2013 -0500 testdb: pass empty local pkglist to alpm_checkdeps Passing the local package list to alpm_checkdeps as both the local packages and packages to be upgraded did nothing but cause extra overhead as the packages were all removed from the installed package list because they were being upgraded. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 43a2f6319455edadf9947d2e0fa9e68ea4e348ae Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Mar 9 11:49:27 2013 -0500 pmpkg: add missing directories to test packages Several tests require complete file lists in order to provide accurate results. These can be non-obvious. Adding missing parent directories helps insure the integrity of tests against human error. Filling in parent directories also allows us to check that file lists are actually valid. There didn't seem to be a good place to do this that was always guaranteed to be run, so this adds a finalize() function to packages that will always be run before the package is actually used to allow for this type of tidying. Fixes FS#30723 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2259dff7f34b082d8e43af15228e74cba75580f6 Author: Olivier Brunel <i.am.jack.mail(a)gmail.com> Date: Sat Feb 23 13:08:44 2013 +0100 makepkg: Add --verifysource to only download/verify source files Because --noextract also implies to not download/verify source files, it wasn't possible to simply do that, without either extracting and/or building. (Note: --verifysource takes precedence over --noextract) Signed-off-by: Olivier Brunel <i.am.jack.mail(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 93fa63ee8a7f17bea676ac4f29d1733cb04ef7d2 Author: Neer Sighted <neersighted(a)myopera.com> Date: Sat Mar 9 08:50:58 2013 -0800 makepkg: Make VCS download functions use get_filename Make all VCS download functions uses get_filename to get the repo name. In addition, creating a working directory from a Bazaar repository now shows the short-name of the repository, not the full path on disk. I'm not sure if the name of the variable that holds the basename of the local clone should still be `repo`, but I have left the variable name for simplicity. Signed-off-by: Neer Sighted <neersighted(a)myopera.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fcdaa46b651904fb88ea325d014bd85edd8a08fe Author: William Giokas <1007380(a)gmail.com> Date: Sat Mar 9 14:36:55 2013 -0600 makepkg: Separate vcs download and extract Previously makepkg would clone vcs sources in the download function, regardless of the noextract settings. Now the download_* functions only download or update the vcs sources, and the new extract_* functions just create working copies using the specified protocols. The extract_sources function will call the needed extract function for the protocol specified. The tarball extraction has also been moved into its own extract_file function to keep things consistent. Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 06d761a0207d579d4976a8c61257516c2b368911 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:32:42 2013 -0500 make paclog-pkglist understand 'downgraded' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce9fd69eba44d997a660c982a8149fae7acb6a29 Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:32:41 2013 -0500 make status/log messages reflect version change Currently pacman either prints 'adding' or 'upgrading' when installing a package. This make pacman print and log the other possible actions: 'downgrade' and 'reinstall' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9876d9783979ec031d673e9a6df845e52fd2febb Author: Allan McRae <allan(a)archlinux.org> Date: Fri Mar 8 17:23:33 2013 +1000 bash_completion: update for color Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 51276f1ac5fd337a8bffbda3099c0bd86b6503cf Author: Simon Gomizelj <simongmzlj(a)gmail.com> Date: Thu Mar 7 01:24:15 2013 -0500 remove the duplicate strnlen and strndup Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 08a1244f4ef952be0c4897b9c5fee12a214be3f9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Mar 7 08:56:13 2013 -0500 libalpm/sync: remove useless intermediate variable This also rearranges some code to ensure that declarations and code aren't mixed. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 6 +- contrib/paclog-pkglist.sh.in | 2 +- doc/makepkg.8.txt | 5 + lib/libalpm/add.c | 61 ++++++------ lib/libalpm/alpm.h | 20 ++++ lib/libalpm/sync.c | 7 +- scripts/makepkg.sh.in | 221 ++++++++++++++++++++++++++++--------------- src/pacman/callback.c | 30 ++++++ src/pacman/util.c | 22 ----- src/util/testdb.c | 14 +-- test/pacman/pmdb.py | 2 +- test/pacman/pmpkg.py | 54 +++++++---- test/pacman/pmtest.py | 3 + 13 files changed, 276 insertions(+), 171 deletions(-) mode change 100644 => 100755 contrib/paclog-pkglist.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] pmpkg: add missing directories to test packages
by Andrew Gregory 09 Mar '13

09 Mar '13

Several tests require complete file lists in order to provide accurate results. These can be non-obvious. Adding missing parent directories helps insure the integrity of tests against human error. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- test/pacman/pmpkg.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/pacman/pmpkg.py b/test/pacman/pmpkg.py index c0c9f13..a78d5cb 100644 --- a/test/pacman/pmpkg.py +++ b/test/pacman/pmpkg.py @@ -153,6 +153,17 @@ def makepkg(self, path): info.size = len(data) tar.addfile(info, StringIO(data)) + # Add missing directories + for name in list(self.files): + fileinfo = util.getfileinfo(name) + filename = fileinfo["filename"] + parent = os.path.dirname(filename.rstrip("/")) + while parent and parent != "/": + if parent not in self.files and parent + "/" not in self.files: + self.files.append(parent + "/") + parent = os.path.dirname(parent) + self.files.sort() + # Generate package file system for name in self.files: fileinfo = util.getfileinfo(name) -- 1.8.1.4

2 7

[pacman-dev] [PATCH] makepkg: separate dl and extract for vcs sources
by William Giokas 09 Mar '13

09 Mar '13

Previously makepkg would clone vcs sources in the download function, regardless of the noextract settings. Now the download_* functions only download or update the vcs sources, and the new extract_* functions just create working copies using the specified protocols. The extract_sources function will call the needed extract function for the protocol specified. The tarball extraction has also been moved into its own extract_file function to keep things consistent. Signed-off-by: William Giokas <1007380(a)gmail.com> --- This isn't really needed, I know, but it would facilitate the --verify function skipping the extraction/cloning of vcs sources while still downloading/updateing them. Using `download_sources fast` would make sense to me to skip the version updating, as that will fail without any $srcdir/. scripts/makepkg.sh.in | 375 ++++++++++++++++++++++++++++---------------------- 1 file changed, 212 insertions(+), 163 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bd29d73..60bf81a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -431,28 +431,11 @@ download_bzr() { warning "$(gettext "Failure while pulling %s")" "${displaylocation}" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! bzr checkout "$dir" --lightweight; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" - plain "$(gettext "Aborting...")" - exit 1 - fi - - popd &>/dev/null } download_git() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -485,54 +468,11 @@ download_git() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - if ! git clone "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi - - cd_safe "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - commit|tag) - ref=${fragment##*=} - ;; - branch) - ref=origin/${fragment##*=} - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if [[ -n $ref ]]; then - if ! git checkout -b makepkg $ref; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" - plain "$(gettext "Aborting...")" - exit 1 - fi - fi - - popd &>/dev/null } download_hg() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -558,41 +498,11 @@ download_hg() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "hg" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - branch|revision|tag) - ref=('-u' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" - plain "$(gettext "Aborting...")" - exit 1 - fi - - popd &>/dev/null } download_svn() { local netfile=$1 - local fragment=${netfile#*#} - if [[ $fragment = "$netfile" ]]; then - unset fragment - fi - local dir=$(get_filepath "$netfile") [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" @@ -620,30 +530,6 @@ download_svn() { warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "svn" fi fi - - msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" - pushd "$srcdir" &>/dev/null - rm -rf "${dir##*/}" - - local ref - if [[ -n $fragment ]]; then - case ${fragment%%=*} in - revision) - ref=('-r' "${fragment##*=}") - ;; - *) - error "$(gettext "Unrecognized reference: %s")" "${fragment}" - plain "$(gettext "Aborting...")" - exit 1 - esac - fi - - if ! svn export ${ref[@]} "$dir"; then - error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" - plain "$(gettext "Aborting...")" - fi - - popd &>/dev/null } download_sources() { @@ -1222,63 +1108,195 @@ check_source_integrity() { fi } -extract_sources() { - msg "$(gettext "Extracting sources...")" - local netfile - for netfile in "${source[@]}"; do - local file=$(get_filename "$netfile") - if in_array "$file" "${noextract[@]}"; then - #skip source files in the noextract=() array - # these are marked explicitly to NOT be extracted - continue - fi +extract_bzr() { + local netfile=$1 + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${dir}" "bzr" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + if ! bzr checkout "$dir" --lightweight; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${dir}" "bzr" + plain "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} + +extract_git() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "git" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" - # fix flyspray #6246 - local file_type=$(file -bizL "$file") - local ext=${file##*.} - local cmd='' - case "$file_type" in - *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) - cmd="bsdtar" ;; - *application/x-gzip*) - case "$ext" in - gz|z|Z) cmd="gzip" ;; - *) continue;; - esac ;; - *application/x-bzip*) - case "$ext" in - bz2|bz) cmd="bzip2" ;; - *) continue;; - esac ;; - *application/x-xz*) - case "$ext" in - xz) cmd="xz" ;; - *) continue;; - esac ;; + if ! git clone "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" + plain "$(gettext "Aborting...")" + exit 1 + fi + + cd_safe "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + commit|tag) + ref=${fragment##*=} + ;; + branch) + ref=origin/${fragment##*=} + ;; *) - # See if bsdtar can recognize the file - if bsdtar -tf "$file" -q '*' &>/dev/null; then - cmd="bsdtar" - else - continue - fi ;; + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 esac + fi - local ret=0 - msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" - if [[ $cmd = "bsdtar" ]]; then - $cmd -xf "$file" || ret=$? - else - rm -f -- "${file%.*}" - $cmd -dcf "$file" > "${file%.*}" || ret=$? - fi - if (( ret )); then - error "$(gettext "Failed to extract %s")" "$file" + if [[ -n $ref ]]; then + if ! git checkout -b makepkg $ref; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "git" plain "$(gettext "Aborting...")" exit 1 fi - done + fi + + popd &>/dev/null +} + +extract_hg() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "hg" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + branch|revision|tag) + ref=('-u' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! hg clone "${ref[@]}" "$dir" "${dir##*/}"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "hg" + plain "$(gettext "Aborting...")" + exit 1 + fi + + popd &>/dev/null +} + +extract_svn() { + local netfile=$1 + + local fragment=${netfile#*#} + if [[ $fragment = "$netfile" ]]; then + unset fragment + fi + + local dir=$(get_filepath "$netfile") + [[ -z "$dir" ]] && dir="$SRCDEST/$(get_filename "$netfile")" + + msg2 "$(gettext "Creating working copy of %s %s repo...")" "${repo}" "svn" + pushd "$srcdir" &>/dev/null + rm -rf "${dir##*/}" + + local ref + if [[ -n $fragment ]]; then + case ${fragment%%=*} in + revision) + ref=('-r' "${fragment##*=}") + ;; + *) + error "$(gettext "Unrecognized reference: %s")" "${fragment}" + plain "$(gettext "Aborting...")" + exit 1 + esac + fi + + if ! svn export ${ref[@]} "$dir"; then + error "$(gettext "Failure while creating working copy of %s %s repo")" "${repo}" "svn" + plain "$(gettext "Aborting...")" + fi + + popd &>/dev/null +} + +extract_file() { + local file=$1 + + # fix flyspray #6246 + local file_type=$(file -bizL "$file") + local ext=${file##*.} + local cmd='' + case "$file_type" in + *application/x-tar*|*application/zip*|*application/x-zip*|*application/x-cpio*) + cmd="bsdtar" ;; + *application/x-gzip*) + case "$ext" in + gz|z|Z) cmd="gzip" ;; + *) continue;; + esac ;; + *application/x-bzip*) + case "$ext" in + bz2|bz) cmd="bzip2" ;; + *) continue;; + esac ;; + *application/x-xz*) + case "$ext" in + xz) cmd="xz" ;; + *) continue;; + esac ;; + *) + # See if bsdtar can recognize the file + if bsdtar -tf "$file" -q '*' &>/dev/null; then + cmd="bsdtar" + else + continue + fi ;; + esac + + local ret=0 + msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd" + if [[ $cmd = "bsdtar" ]]; then + $cmd -xf "$file" || ret=$? + else + rm -f -- "${file%.*}" + $cmd -dcf "$file" > "${file%.*}" || ret=$? + fi + if (( ret )); then + error "$(gettext "Failed to extract %s")" "$file" + plain "$(gettext "Aborting...")" + exit 1 + fi if (( EUID == 0 )); then # change perms of all source files to root user & root group @@ -1286,6 +1304,37 @@ extract_sources() { fi } +extract_sources() { + msg "$(gettext "Preparing sources...")" + local netfile + for netfile in "${source[@]}"; do + local file=$(get_filename "$netfile") + if in_array "$file" "${noextract[@]}"; then + #skip source files in the noextract=() array + # these are marked explicitly to NOT be extracted + continue + fi + local proto=$(get_protocol "$netfile") + case "$proto" in + bzr*) + extract_bzr "$netfile" + ;; + git*) + extract_git "$netfile" + ;; + hg*) + extract_hg "$netfile" + ;; + svn*) + extract_svn "$netfile" + ;; + *) + extract_file "$file" + ;; + esac + done +} + error_function() { if [[ -p $logpipe ]]; then rm "$logpipe" -- 1.8.2.rc0.22.gb3600c3

2 7

[pacman-dev] [PATCH 1/2] testdb: pass empty local pkglist to alpm_checkdeps
by Andrew Gregory 09 Mar '13

09 Mar '13

Passing the local package list to alpm_checkdeps as both the local packages and packages to be upgraded did nothing but cause extra overhead as the packages were all removed from the installed package list because they were being upgraded. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/util/testdb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/testdb.c b/src/util/testdb.c index 7b08cb0..073acc3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -98,7 +98,7 @@ static int check_deps(alpm_list_t *pkglist) alpm_list_t *data, *i; int ret = 0; /* check dependencies */ - data = alpm_checkdeps(handle, pkglist, NULL, pkglist, 0); + data = alpm_checkdeps(handle, NULL, NULL, pkglist, 0); for(i = data; i; i = alpm_list_next(i)) { alpm_depmissing_t *miss = i->data; char *depstring = alpm_dep_compute_string(miss->depend); -- 1.8.1.5

1 1

[pacman-dev] [PATCHv2 1/4] zsh completion: add querying packages for database
by Daniel Wallace 09 Mar '13

09 Mar '13

Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- contrib/zsh_completion.in | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index ab658c1..cae12ae 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -79,6 +79,7 @@ _pacman_opts_remove=( _pacman_opts_database=( '--asdeps[mark packages as non-explicitly installed]' '--asexplicit[mark packages as explicitly installed]' + '*:installed package:_pacman_completions_installed_packages' ) # options for passing to _arguments: options for --sync command -- 1.8.1.5

3 6

[pacman-dev] [PATCH] zsh completion: include description for clean
by Daniel Wallace 09 Mar '13

09 Mar '13

needs a description in the main case statement. Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- I forgot to add this to the last patch of the last ones. contrib/zsh_completion.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index fa63203..48bbb39 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -366,8 +366,8 @@ _pacman_zsh_comp() { _pacman_action_database ;; S*c*) # no completion - _arguments -s \ - '(-c --clean)'{\*-c,\*--clean} \ + _arguments -s : \ + '(-c --clean)'{\*-c,\*--clean}'[Remove all files from the cache]' \ "$_pacman_opts_common[@]" ;; S*l*) # repos -- 1.8.1.5

2 1

[pacman-dev] [PATCH 1/4] zsh completion: add deptest and database
by Daniel Wallace 09 Mar '13

09 Mar '13

Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> --- contrib/zsh_completion.in | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 84ee93c..a40192c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -6,9 +6,11 @@ typeset -A opt_args # options for passing to _arguments: main pacman commands _pacman_opts_commands=( + '-D[Modify database]' '-Q[Query the package database]' '-R[Remove a package from the system]' '-S[Synchronize packages]' + '-T[Check if dependencies are installed]' '-U[Upgrade a package]' '-V[Display version and exit]' '-h[Display usage]' @@ -71,6 +73,11 @@ _pacman_opts_remove=( '*:installed package:_pacman_completions_installed_packages' ) +_pacman_opts_database=( + '--asdeps[mark packages as non-explicitly installed]' + '--asexplicit[mark packages as explicitly installed]' +) + # options for passing to _arguments: options for --sync command _pacman_opts_sync_actions=( '*-c[Remove old packages from cache]:*:clean:->sync_clean' @@ -164,6 +171,16 @@ _pacman_action_remove() { "$_pacman_opts_remove[@]" } +# handles --database subcommand +_pacman_action_database() { + _arguments -s : \ + '-D' \ + "$_pacman_opts_common[@]" \ + "$_pacman_opts_database[@]" +} + + + # handles --sync subcommand _pacman_action_sync() { local context state line @@ -309,6 +326,13 @@ _pacman_zsh_comp() { -Q*) _pacman_action_query ;; -R*) _pacman_action_remove ;; -S*c*) # no completion + -T*) + _arguments -s : \ + '-T' \ + "$_pacman_opts_common[@]" \ + ":packages:_pacman_all_packages" + ;; + -D*) _pacman_action_database ;; return 0 ;; -S*l*) # repos -- 1.8.1.5

3 7

[pacman-dev] [PATCH 1/2] make status/log messages reflect version change
by Simon Gomizelj 08 Mar '13

08 Mar '13

Currently pacman either prints 'adding' or 'upgrading' when installing a package. This make pacman print and log the other possible actions: 'downgrade' and 'reinstall' Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- lib/libalpm/add.c | 61 +++++++++++++++++++++++---------------------------- lib/libalpm/alpm.h | 20 +++++++++++++++++ src/pacman/callback.c | 30 +++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index f70e2cb..1d9db60 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -464,10 +464,13 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, size_t pkg_current, size_t pkg_count) { int i, ret = 0, errors = 0; - int is_upgrade; + int is_upgrade = 0; alpm_pkg_t *oldpkg = NULL; alpm_db_t *db = handle->db_local; alpm_trans_t *trans = handle->trans; + alpm_progress_t event = ALPM_PROGRESS_ADD_START; + alpm_event_t done = ALPM_EVENT_ADD_DONE, start = ALPM_EVENT_ADD_START; + const char *log_msg = "adding"; const char *pkgfile; ASSERT(trans != NULL, return -1); @@ -475,6 +478,23 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* see if this is an upgrade. if so, remove the old package first */ alpm_pkg_t *local = _alpm_db_get_pkgfromcache(db, newpkg->name); if(local) { + int cmp = _alpm_pkg_compare_versions(newpkg, local); + if(cmp < 0) { + log_msg = "downgrading"; + event = ALPM_PROGRESS_DOWNGRADE_START; + start = ALPM_EVENT_DOWNGRADE_START; + done = ALPM_EVENT_DOWNGRADE_DONE; + } else if(cmp == 0) { + log_msg = "reinstalling"; + event = ALPM_PROGRESS_REINSTALL_START; + start = ALPM_EVENT_REINSTALL_START; + done = ALPM_EVENT_REINSTALL_DONE; + } else { + log_msg = "upgrading"; + event = ALPM_PROGRESS_UPGRADE_START; + start = ALPM_EVENT_UPGRADE_START; + done = ALPM_EVENT_UPGRADE_DONE; + } is_upgrade = 1; /* we'll need to save some record for backup checks later */ @@ -485,17 +505,14 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, /* copy over the install reason */ newpkg->reason = alpm_pkg_get_reason(local); - - EVENT(handle, ALPM_EVENT_UPGRADE_START, newpkg, local); - } else { - is_upgrade = 0; - EVENT(handle, ALPM_EVENT_ADD_START, newpkg, NULL); } + EVENT(handle, start, newpkg, local); + pkgfile = newpkg->origin_data.file; _alpm_log(handle, ALPM_LOG_DEBUG, "%s package %s-%s\n", - is_upgrade ? "upgrading" : "adding", newpkg->name, newpkg->version); + log_msg, newpkg->name, newpkg->version); /* pre_install/pre_upgrade scriptlet */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) { @@ -564,13 +581,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, } /* call PROGRESS once with 0 percent, as we sort-of skip that here */ - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 0, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 0, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 0, pkg_count, pkg_current); for(i = 0; archive_read_next_header(archive, &entry) == ARCHIVE_OK; i++) { int percent; @@ -588,13 +599,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, percent = 0; } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, percent, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, percent, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, percent, pkg_count, pkg_current); /* extract the next file from the archive */ errors += extract_single_file(handle, archive, entry, newpkg, oldpkg); @@ -651,13 +656,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, newpkg->name); } - if(is_upgrade) { - PROGRESS(handle, ALPM_PROGRESS_UPGRADE_START, - newpkg->name, 100, pkg_count, pkg_current); - } else { - PROGRESS(handle, ALPM_PROGRESS_ADD_START, - newpkg->name, 100, pkg_count, pkg_current); - } + PROGRESS(handle, event, newpkg->name, 100, pkg_count, pkg_current); /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) @@ -670,11 +669,7 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg, free(scriptlet); } - if(is_upgrade) { - EVENT(handle, ALPM_EVENT_UPGRADE_DONE, newpkg, oldpkg); - } else { - EVENT(handle, ALPM_EVENT_ADD_DONE, newpkg, oldpkg); - } + EVENT(handle, done, newpkg, oldpkg); cleanup: _alpm_pkg_free(oldpkg); diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index afa5cd7..ccbdd1c 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -321,6 +321,24 @@ typedef enum _alpm_event_t { * to the callback, respectively. */ ALPM_EVENT_UPGRADE_DONE, + /** Package will be downgraded. + * A pointer to the downgraded package is passed to the callback. + */ + ALPM_EVENT_DOWNGRADE_START, + /** Package was downgraded. + * A pointer to the new package, and a pointer to the old package is passed + * to the callback, respectively. + */ + ALPM_EVENT_DOWNGRADE_DONE, + /** Package will be reinstalled. + * A pointer to the reinstalled package is passed to the callback. + */ + ALPM_EVENT_REINSTALL_START, + /** Package was reinstalled. + * A pointer to the new package, and a pointer to the old package is passed + * to the callback, respectively. + */ + ALPM_EVENT_REINSTALL_DONE, /** Target package's integrity will be checked. */ ALPM_EVENT_INTEGRITY_START, /** Target package's integrity was checked. */ @@ -400,6 +418,8 @@ typedef void (*alpm_cb_question)(alpm_question_t, void *, void *, void *, int *) typedef enum _alpm_progress_t { ALPM_PROGRESS_ADD_START, ALPM_PROGRESS_UPGRADE_START, + ALPM_PROGRESS_DOWNGRADE_START, + ALPM_PROGRESS_REINSTALL_START, ALPM_PROGRESS_REMOVE_START, ALPM_PROGRESS_CONFLICTS_START, ALPM_PROGRESS_DISKSPACE_START, diff --git a/src/pacman/callback.c b/src/pacman/callback.c index edd5b39..152bbf1 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -207,6 +207,30 @@ void cb_event(alpm_event_t event, void *data1, void *data2) alpm_pkg_get_version(data1)); display_new_optdepends(data2, data1); break; + case ALPM_EVENT_DOWNGRADE_START: + if(config->noprogressbar) { + printf(_("downgrading %s...\n"), alpm_pkg_get_name(data1)); + } + break; + case ALPM_EVENT_DOWNGRADE_DONE: + alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, + "downgraded %s (%s -> %s)\n", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data2), + alpm_pkg_get_version(data1)); + display_new_optdepends(data2, data1); + break; + case ALPM_EVENT_REINSTALL_START: + if(config->noprogressbar) { + printf(_("reinstalling %s...\n"), alpm_pkg_get_name(data1)); + } + break; + case ALPM_EVENT_REINSTALL_DONE: + alpm_logaction(config->handle, PACMAN_CALLER_PREFIX, + "reinstalled %s (%s)\n", + alpm_pkg_get_name(data1), + alpm_pkg_get_version(data1)); + break; case ALPM_EVENT_INTEGRITY_START: if(config->noprogressbar) { printf(_("checking package integrity...\n")); @@ -444,6 +468,12 @@ void cb_progress(alpm_progress_t event, const char *pkgname, int percent, case ALPM_PROGRESS_UPGRADE_START: opr = _("upgrading"); break; + case ALPM_PROGRESS_DOWNGRADE_START: + opr = _("downgrading"); + break; + case ALPM_PROGRESS_REINSTALL_START: + opr = _("reinstalling"); + break; case ALPM_PROGRESS_REMOVE_START: opr = _("removing"); break; -- 1.8.1.5

2 2

[pacman-dev] [PATCH] bash_completion: update for color
by Allan McRae 08 Mar '13

08 Mar '13

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I guess this is what is needed... anyone more familiar with bash completion want to confirm? contrib/bash_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index b0901af..6ab264d 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -46,7 +46,7 @@ _pacman_key() { _get_comp_words_by_ref cur prev opts=('add delete export finger help list-keys recv-keys updatedb verify version config edit-key gpgdir import import-trustdb init keyserver - list-sigs lsign-key populate refresh-keys' + list-sigs lsign-key populate refresh-keys nocolor' 'a d e f h l r u v V') # operations for which we want to complete keyids @@ -105,7 +105,7 @@ _pacman() { info list needed nodeps print refresh recursive search sysupgrade' 'c g i l p s u w y') upgrade=('asdeps asexplicit force needed nodeps print recursive' 'p') - common=('arch cachedir config dbpath debug help logfile noconfirm + common=('arch cachedir color config dbpath debug help logfile noconfirm noprogressbar noscriptlet quiet root verbose' 'b d h q r v') core=('database help query remove sync upgrade version' 'D Q R S U V h') @@ -116,7 +116,7 @@ _pacman() { if [[ $? != 0 ]]; then _arch_ptr2comp core elif [[ ! $prev =~ ^-\w*[Vbhr] && - ! $prev = --@(cachedir|config|dbpath|help|logfile|root|version) ]] + ! $prev = --@(cachedir|color|config|dbpath|help|logfile|root|version) ]] then [[ $cur = -* ]] && _arch_ptr2comp ${o#* } common || case ${o% *} in -- 1.8.1.5

1 0