- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] sync: avoid checking file conflicts with --dbonly
by Dave Reisner 12 Dec '11

12 Dec '11

Scratches my own itch from FS#25667 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- lib/libalpm/sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 3817ec8..534499a 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -1160,7 +1160,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data) trans->state = STATE_COMMITING; /* fileconflict check */ - if(!(trans->flags & ALPM_TRANS_FLAG_FORCE)) { + if(!(trans->flags & (ALPM_TRANS_FLAG_FORCE|ALPM_TRANS_FLAG_DBONLY))) { EVENT(handle, ALPM_EVENT_FILECONFLICTS_START, NULL, NULL); _alpm_log(handle, ALPM_LOG_DEBUG, "looking for file conflicts\n"); -- 1.7.7.4

4 4

[pacman-dev] [PATCH] pacman: list all unknown targets on removal operation
by Allan McRae 12 Dec '11

12 Dec '11

On a removal operation, pacman currently reports an error for the package that is not found in the database and then exists. Adjust so that all unknown packages are reported. Before: > pacman -R foo bar error: 'foo': target not found After: > pacman -R foo bar error: 'foo': target not found error: 'bar': target not found Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/remove.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/pacman/remove.c b/src/pacman/remove.c index f56c1ec..b6da7c3 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -104,10 +104,13 @@ int pacman_remove(alpm_list_t *targets) } if(remove_target(targ) == -1) { retval = 1; - goto cleanup; } } + if(retval == 1) { + goto cleanup; + } + /* Step 2: prepare the transaction based on its type, targets and flags */ if(alpm_trans_prepare(config->handle, &data) == -1) { alpm_errno_t err = alpm_errno(config->handle); -- 1.7.8

3 4

[pacman-dev] [PATCH] makepkg: split source elements when looking for sigs
by Dave Reisner 11 Dec '11

11 Dec '11

Allows renamed .asc/.sig files to be still discovered by makepkg. This is needed for a package such as PuTTY, which provides abnormally named sig files (.DSA and .RSA) which are valid input for gpg --verify. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Related: do we want to natively support .SIG and .ASC as well? Or would we be content with this patch as a workaround for "abnormal" sig files like that? scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index a0a94fe..a4a3d13 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -331,10 +331,10 @@ in_array() { return 1 # Not Found } -source_has_signatures(){ +source_has_signatures() { local file for file in "${source[@]}"; do - if [[ $file = *.@(sig?(n)|asc) ]]; then + if [[ ${file%%::*} = *.@(sig?(n)|asc) ]]; then return 0 fi done -- 1.7.8

3 4

[pacman-dev] [PATCH 3/3] makepkg: Making git support do auto-clone/fetch.
by John Sumsion 10 Dec '11

10 Dec '11

>From 4a26847342e3b33217f0682af4e350b71098befe Mon Sep 17 00:00:00 2001 From: John Sumsion <john(a)sumsion.org> Date: Sat, 3 Dec 2011 09:36:52 -0700 Subject: [PATCH 3/3] makepkg: Making git support do auto-clone/fetch. Patterned after the hg logic. Signed-off-by: John Sumsion <john(a)sumsion.org> --- scripts/makepkg.sh.in | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8a5eca0..83337fe 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1701,8 +1701,18 @@ devel_check() { return 0 fi msg "$(gettext "Determining latest %s revision...")" 'git' + if [[ -d ./src/$_gitname ]] ; then + cd ./src/$_gitname + git remote update + else + [[ ! -d ./src/ ]] && mkdir ./src/ + git clone $_gitroot/$_gitname ./src/$_gitname + cd ./src/$_gitname + fi newpkgver=${_gitref:-origin/master} + git reset --hard ${newpkgver} newpkgver=$(git describe --always ${newpkgver} | sed -e 's/-/_/g') + cd ../../ elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then if ! type -p svn >/dev/null; then warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "svn" "svn" -- 1.7.8

3 2

[pacman-dev] [PATCH] Make automake generate silent rules by default
by Dan McGee 08 Dec '11

08 Dec '11

This will require you to pass 'V=1' if you want the previous, more verbose output. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 39e34c8..fb1e0b3 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,8 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([silent-rules]) +AM_INIT_AUTOMAKE([1.11]) +AM_SILENT_RULES([yes]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" -- 1.7.8

1 0

[pacman-dev] [PATCH] pacsysclean: Add new contrib script
by Eric Bélanger 08 Dec '11

08 Dec '11

pacsysclean sort installed packages by decreasing installed size. It's useful for finding large unused package when doing system clean-up. This script is an improved version of other similar scripts posted on the forums. Thanks goes to Dan for fixing and improving my original script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 +++- contrib/pacsysclean.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletions(-) create mode 100755 contrib/pacsysclean.in diff --git a/contrib/.gitignore b/contrib/.gitignore index 1bd145f..19b81e0 100644 --- a/contrib/.gitignore +++ b/contrib/.gitignore @@ -6,5 +6,6 @@ paclist paclog-pkglist pacscripts pacsearch +pacsysclean wget-xdelta.sh zsh_completion diff --git a/contrib/Makefile.am b/contrib/Makefile.am index be0a4ba..0ff1d9d 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -5,7 +5,8 @@ OURSCRIPTS = \ paclist \ paclog-pkglist \ pacscripts \ - pacsearch + pacsearch \ + pacsysclean OURFILES = \ bash_completion \ @@ -21,6 +22,7 @@ EXTRA_DIST = \ paclist.in \ pacscripts.in \ pacsearch.in \ + pacsysclean.in \ vimprojects \ zsh_completion.in \ README @@ -59,6 +61,7 @@ paclist: $(srcdir)/paclist.in paclog-pkglist: $(srcdir)/paclog-pkglist.in pacscripts: $(srcdir)/pacscripts.in pacsearch: $(srcdir)/pacsearch.in +pacsysclean: $(srcdir)/pacsysclean.in pactree: $(srcdir)/pactree.in zsh_completion: $(srcdir)/zsh_completion.in diff --git a/contrib/pacsysclean.in b/contrib/pacsysclean.in new file mode 100755 index 0000000..c87082e --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,50 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. + +PACMAN_OPTS= + +usage() { + echo "pacsysclean - Sort installed packages by decreasing installed size." + echo + echo "Usage: pacsysclean [options]" + echo + echo "Options:" + echo " -o <options> Specify custom pacman query options (e.g., dt)" + echo " -h, --help Show this help message and exit" +} + + +if [ -n "$1" ]; then + case "$1" in + -o) PACMAN_OPTS="${2}" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +IFS=$'\n' +name="^Name.*: (.*)$" +size="^Installed Size.*: (.*) KiB$" +for line in $(LANG=C pacman -Qi $PACMAN_OPTS); do + if [[ $line =~ $name ]]; then + printf "%s\t" ${BASH_REMATCH[1]} + elif [[ $line =~ $size ]]; then + printf "%s\n" ${BASH_REMATCH[1]} + fi +done | sort -g -k2 | awk ' +BEGIN { + split("KiB MiB GiB TiB PiB EiB ZiB YiB", suffix) +} +function format_size(size) { + count = 1 + while (size + 0 > 1024) { + size /= 1024 + count++ + } + sizestr = sprintf("%.2f %s", size, suffix[count]) + return sizestr +} +{ + printf("%s\t%s\n", format_size($2), $1); +}' -- 1.7.7.4

1 1

[pacman-dev] [PATCH 2/3] makepkg: Teach git support to use 'git describe'.
by John Sumsion 08 Dec '11

08 Dec '11

>From ebecca0cd0760e3e808b5f411f336930b8ac8152 Mon Sep 17 00:00:00 2001 From: John Sumsion <john(a)sumsion.org> Date: Sat, 3 Dec 2011 09:36:47 -0700 Subject: [PATCH 2/3] makepkg: Teach git support to use 'git describe'. Signed-off-by: John Sumsion <john(a)sumsion.org> --- scripts/makepkg.sh.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2a92f99..8a5eca0 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1701,7 +1701,8 @@ devel_check() { return 0 fi msg "$(gettext "Determining latest %s revision...")" 'git' - newpkgver=${_gitref:-$(date +%Y%m%d)} + newpkgver=${_gitref:-origin/master} + newpkgver=$(git describe --always ${newpkgver} | sed -e 's/-/_/g') elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then if ! type -p svn >/dev/null; then warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "svn" "svn" -- 1.7.8

2 1

[pacman-dev] [PATCH 1/3] makepkg: Allowing for git & hg ref override.
by John Sumsion 08 Dec '11

08 Dec '11

>From 56d2a4c494c491f938eeb9b1173a1dad3950058b Mon Sep 17 00:00:00 2001 From: John Sumsion <john(a)sumsion.org> Date: Sat, 3 Dec 2011 09:36:36 -0700 Subject: [PATCH 1/3] makepkg: Allowing for git & hg ref override. Signed-off-by: John Sumsion <john(a)sumsion.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0fa05dc..2a92f99 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1701,7 +1701,7 @@ devel_check() { return 0 fi msg "$(gettext "Determining latest %s revision...")" 'git' - newpkgver=$(date +%Y%m%d) + newpkgver=${_gitref:-$(date +%Y%m%d)} elif [[ -n ${_svntrunk} && -n ${_svnmod} ]] ; then if ! type -p svn >/dev/null; then warning "$(gettext "Cannot find the %s binary required to determine latest %s revision.")" "svn" "svn" @@ -1731,7 +1731,7 @@ devel_check() { hg clone $_hgroot/$_hgrepo ./src/$_hgrepo cd ./src/$_hgrepo fi - newpkgver=$(hg tip --template "{rev}") + newpkgver=${_hgref:-$(hg tip --template "{rev}")} cd ../../ fi -- 1.7.8

2 1

[pacman-dev] [PATCH] Use automake verbose helpers in custom make rules
by Dan McGee 08 Dec '11

08 Dec '11

This converts our script generation to use the built-in AM_V_GEN macro, which honors the V= setting passed to make and allows one to see the full command if they truly desire. The AM_V_at macro is also used in place of an explicit @ so verbose-mode compiles show all commands being run. We can also use these two macros in doc generation to quiet it down to the level we expect. Other minor changes: * a pointless test call is removed in test/pacman/tests/ * sed is used instead of dos2unix as we depend on it anyway * consecutive chmod calls are reduced to a single call (e.g., '+x,a-x') Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Dave, I know you are good at shell stuff- can you take a look at this and make sure it is kosher? Mainly the chmod changes (is that comma stuff cross-platform?), and the sed conversion (cd doc/; make website). Thanks! Example full complile run now, including docs: $ make -s -j3 V=0 Making all in lib/libalpm Making all in po CC alpm.lo CC add.lo CC alpm_list.lo CC backup.lo CC be_local.lo CC be_package.lo CC be_sync.lo CC conflict.lo CC db.lo CC delta.lo CC deps.lo CC diskspace.lo CC dload.lo CC error.lo CC graph.lo CC group.lo CC handle.lo CC log.lo CC package.lo CC pkghash.lo CC rawstr.lo CC remove.lo CC signing.lo CC sync.lo CC trans.lo CC util.lo CC version.lo CC base64.lo CCLD libalpm.la Making all in src/util CC vercmp.o CC testpkg.o CC testdb.o CC cleanupdelta.o CC pacsort.o CC pactree.o CCLD vercmp CCLD testpkg CCLD testdb CCLD cleanupdelta CCLD pacsort CCLD pactree Making all in src/pacman Making all in po CC conf.o CC database.o CC deptest.o CC package.o CC pacman.o CC query.o CC remove.o CC sync.o CC callback.o CC upgrade.o CC util.o CCLD pacman Making all in scripts Making all in po GEN makepkg GEN pacman-db-upgrade GEN pacman-key GEN pacman-optimize GEN pkgdelta GEN rankmirrors GEN repo-add Making all in etc GEN makepkg.conf GEN pacman.conf Making all in test/pacman Making all in tests GEN sync200.py Making all in test/util Making all in contrib GEN pacdiff GEN bacman GEN paccache GEN paclist GEN paclog-pkglist GEN pacscripts GEN pacsearch GEN bash_completion GEN zsh_completion Making all in doc GEN pacman.8 GEN makepkg.8 GEN repo-add.8 GEN vercmp.8 GEN pkgdelta.8 GEN pacman-key.8 GEN PKGBUILD.5 GEN makepkg.conf.5 GEN pacman.conf.5 GEN libalpm.3 contrib/Makefile.am | 19 ++++++++----------- doc/Makefile.am | 16 +++++++++------- etc/Makefile.am | 7 +++---- scripts/Makefile.am | 10 +++------- test/pacman/tests/Makefile.am | 10 ++++------ 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index be0a4ba..970e17b 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -35,19 +35,16 @@ edit = sed \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile - @echo ' ' GEN $@; - @$(RM) $@ $@.tmp - @$(edit) $(srcdir)/$@.in >$@.tmp - @chmod +x $@.tmp - @chmod a-w $@.tmp - @mv $@.tmp $@ + $(AM_V_at)$(RM) $@ $@.tmp + $(AM_V_GEN)$(edit) $(srcdir)/$@.in >$@.tmp + $(AM_V_at)chmod +x,a-w $@.tmp + $(AM_V_at)mv $@.tmp $@ $(OURFILES): Makefile - @echo ' ' GEN $@; - @$(RM) $@ $@.tmp - @$(edit) $(srcdir)/$@.in >$@.tmp - @chmod a-w $@.tmp - @mv $@.tmp $@ + $(AM_V_at)$(RM) $@ $@.tmp + $(AM_V_GEN)$(edit) $(srcdir)/$@.in >$@.tmp + $(AM_V_at)chmod a-w $@.tmp + $(AM_V_at)mv $@.tmp $@ all-am: $(OURSCRIPTS) $(OURFILES) diff --git a/doc/Makefile.am b/doc/Makefile.am index f449e72..b8d42d6 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -90,8 +90,10 @@ endif html: $(HTML_DOCS) -website: html - bsdtar czf website.tar.gz $(HTML_DOCS) \ +website: website.tar.gz + +website.tar.gz: html + $(AM_V_GEN)bsdtar czf $@ $(HTML_DOCS) \ asciidoc-override.css \ -C /etc/asciidoc/stylesheets/ \ asciidoc.css \ @@ -119,15 +121,15 @@ A2X_OPTS = \ # These rules are due to the includes and files of the asciidoc text $(ASCIIDOC_MANS): asciidoc.conf footer.txt Makefile - a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt + $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.txt %.html: %.txt - asciidoc $(ASCIIDOC_OPTS) $*.txt - dos2unix $@ + $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.txt | \ + sed -e 's/\x0D$$//' > $@ HACKING.html: ../HACKING - asciidoc $(ASCIIDOC_OPTS) -o $@ ../HACKING - dos2unix $@ + $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - ../HACKING | \ + sed -e 's/\x0D$$//' > $@ # Customizations for certain HTML docs $(HTML_MANPAGES): asciidoc.conf footer.txt Makefile diff --git a/etc/Makefile.am b/etc/Makefile.am index d504d7f..58a80bd 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -22,10 +22,9 @@ edit = sed \ -e 's|@ROOTDIR[@]|$(ROOTDIR)|g' $(dist_sysconf_DATA): Makefile - @echo ' ' GEN $@; - @$(RM) $@ $@.tmp - @$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp - @mv $@.tmp $@ + $(AM_V_at)$(RM) $@ $@.tmp + $(AM_V_GEN)$(edit) `test -f ./$@.in || echo $(srcdir)/`$@.in >$@.tmp + $(AM_V_at)mv $@.tmp $@ makepkg.conf: $(srcdir)/makepkg.conf.in pacman.conf: $(srcdir)/pacman.conf.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d89fd30..328fbff 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -60,14 +60,10 @@ edit = sed \ ## All the scripts depend on Makefile so that they are rebuilt when the ## prefix etc. changes. Use chmod -w to prevent people from editing the ## wrong file by accident. -# two 'test' lines- make sure we can handle both sh and py type scripts -# third 'test' line- make sure one of the two checks succeeded $(OURSCRIPTS): Makefile - @echo ' ' GEN $@; - @$(RM) $@ - @test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ - @chmod +x $@ - @chmod a-w $@ + $(AM_V_at)$(RM) $@ + $(AM_V_GEN)test -f $(srcdir)/$@.sh.in && m4 -P -I $(srcdir) $(srcdir)/$@.sh.in | $(edit) >$@ + $(AM_V_at)chmod +x,a-w $@ makepkg: \ $(srcdir)/makepkg.sh.in \ diff --git a/test/pacman/tests/Makefile.am b/test/pacman/tests/Makefile.am index 508534a..9ab0c77 100644 --- a/test/pacman/tests/Makefile.am +++ b/test/pacman/tests/Makefile.am @@ -17,11 +17,9 @@ edit = sed \ $(CONFTESTS): Makefile - @echo ' ' GEN $@; - @$(RM) $@ $@.tmp - @test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true - @test -f $@.tmp || false - @chmod a-w $@.tmp - @mv $@.tmp $@ + $(AM_V_at)$(RM) $@ $@.tmp + $(AM_V_GEN)test -f $(srcdir)/$@.in && $(edit) $(srcdir)/$@.in >$@.tmp || true + $(AM_V_at)chmod a-w $@.tmp + $(AM_V_at)mv $@.tmp $@ # vim:set ts=2 sw=2 noet: -- 1.7.8

2 1

[pacman-dev] [PATCH] Add 'silent-rules' to automake setup in configure.ac
by Dan McGee 07 Dec '11

07 Dec '11

This is awesome, and I don't know why we haven't already done this. It gives us the much more less verbose make output in a few different ways: * If you run `make V=0`, you will get the quiet output. * If you run `./configure --enable-silent-rules`, the quiet output is the default; verbose output can be had by passing V=1 to make. make[3]: Entering directory `/home/dmcgee/projects/pacman/lib/libalpm' CC add.lo CC be_local.lo CC be_package.lo CC be_sync.lo CC delta.lo ..... Signed-off-by: Dan McGee <dan(a)archlinux.org> --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index d4ec677..39e34c8 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([silent-rules]) LIB_VERSION=`expr lib_current - lib_age`.lib_age.lib_revision LIB_VERSION_INFO="lib_current:lib_revision:lib_age" -- 1.7.8

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-72-gb522516
by dan＠archlinux.org 07 Dec '11

07 Dec '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 b5225165c070b30f8ec5a71ff5a12ea43102c3da (commit) via 86cb6e1f0f59f760a936f648a20206af095a196b (commit) via 0e4946d5593e5968c1d6bca50402eaf7a8620526 (commit) via a3a75e0a41680283572895165da3fe2505314dec (commit) via 1038e669649dae98c1cf9c354e680c62cf25638c (commit) via 48188fbeee8bc39977bc2a0200dc5fb538db9ff1 (commit) via 6a1d3948a670184f01a697efe55b91b4ccdcb51d (commit) via 17e0be9e6a5ed1cf5611e23d3c9debd0a3248077 (commit) via d85d0ddcfeab6212a588e50529744277f0ca48bb (commit) via 61ce2ca1bbf4f8042c77e50a37297003bdebd01d (commit) from 1d98c6347c9622d4334f80fc59623da524b4f37b (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 b5225165c070b30f8ec5a71ff5a12ea43102c3da Author: Dan McGee <dan(a)archlinux.org> Date: Thu Dec 1 16:18:23 2011 -0600 Move items around in the alpm handle struct This allows for the struct layout to have no empty spaces. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 86cb6e1f0f59f760a936f648a20206af095a196b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 22 19:09:58 2011 -0600 Slight local database files reading optimization Since we know the length of the line, we can use this all the way through and do a cheaper operation than strdup() by just invoking malloc and memcpy directly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0e4946d5593e5968c1d6bca50402eaf7a8620526 Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Tue Dec 6 22:29:33 2011 +0100 scripts/*: Declare several constant variables read-only Be more semantically accurate and avoid accidental overwriting of some configuration variables that are considered to be constant. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3a75e0a41680283572895165da3fe2505314dec Merge: 1038e66 6a1d394 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 7 10:00:20 2011 -0600 Merge branch 'maint' commit 1038e669649dae98c1cf9c354e680c62cf25638c Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Tue Dec 6 22:29:32 2011 +0100 contrib/*: Hardcode program names Add a read-only variable "$myname" to every contrib script and hardcode program names instead of relying on "$0". The variable name "$myname" was chosen because it is already used in pacman and because we use "$myver" to specify the program version in the official scripts. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 48188fbeee8bc39977bc2a0200dc5fb538db9ff1 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 7 09:56:19 2011 -0600 Add 'silent-rules' to automake setup in configure.ac This is awesome, and I don't know why we haven't already done this. It gives us the much more less verbose make output in a few different ways: * If you run `make V=0`, you will get the quiet output. * If you run `./configure --enable-silent-rules`, the quiet output is the default; verbose output can be had by passing V=1 to make. make[3]: Entering directory `/home/dmcgee/projects/pacman/lib/libalpm' CC add.lo CC be_local.lo CC be_package.lo CC be_sync.lo CC delta.lo ..... Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/bacman.in | 14 +++++++------- contrib/paccache.in | 6 ++++-- contrib/pacdiff.in | 10 ++++++---- contrib/paclist.in | 10 ++++++---- contrib/paclog-pkglist.in | 6 ++++-- contrib/pacscripts.in | 10 +++++----- contrib/pacsearch.in | 10 +++++----- lib/libalpm/be_local.c | 18 +++++++++++++----- lib/libalpm/dload.c | 3 +++ lib/libalpm/handle.h | 2 +- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 8 ++++---- scripts/pacman-db-upgrade.sh.in | 2 +- scripts/pacman-key.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/repo-add.sh.in | 23 ++++++++++++++--------- 18 files changed, 78 insertions(+), 54 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-9-g6a1d394
by dan＠archlinux.org 07 Dec '11

07 Dec '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 6a1d3948a670184f01a697efe55b91b4ccdcb51d (commit) via 17e0be9e6a5ed1cf5611e23d3c9debd0a3248077 (commit) via d85d0ddcfeab6212a588e50529744277f0ca48bb (commit) via 61ce2ca1bbf4f8042c77e50a37297003bdebd01d (commit) from 5490cd6eb22752d2eac5410152d239c50224dbc1 (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 6a1d3948a670184f01a697efe55b91b4ccdcb51d Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 5 23:20:08 2011 -0600 Use correct size in memset We were using the size of a pointer, not the size of the whole archive_read_buffer struct. Thanks to Clang/LLVM 3.0 and Allan/Dave in IRC for finding this one. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 17e0be9e6a5ed1cf5611e23d3c9debd0a3248077 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 5 10:07:40 2011 -0600 repo-add: enforce maximum .sig file size This prevents user error in adding a file generated via `gpg --sign` rather than `--detach-sign`, for example. The same 16KiB limit is used we use in our pacman download code. The section is moved above the checksum generation to avoid presenting info messages to the user if the signature isn't valid. Addresses a shortcoming pointed out in FS#27453. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d85d0ddcfeab6212a588e50529744277f0ca48bb Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 5 10:06:12 2011 -0600 Enforce signature download size limit on -U <url> operations We had a 16 KiB limit on database signatures, we should do the same here too to have a slight sanity check, even if we can't do so for the package itself yet. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 61ce2ca1bbf4f8042c77e50a37297003bdebd01d Author: Lukas Fleischer <archlinux(a)cryptocrack.de> Date: Fri Dec 2 09:49:30 2011 +0100 contrib/paclist: Add "--help" command line parameter Be consistent with all other contrib scripts and support the "--help" command line switch. Fixes FS#27258. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/paclist.in | 2 +- lib/libalpm/dload.c | 3 +++ lib/libalpm/util.c | 2 +- scripts/repo-add.sh.in | 19 ++++++++++++------- 4 files changed, 17 insertions(+), 9 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] dependency resolution fails if package exists in different repos/groups
by Pierre Schmitz 07 Dec '11

07 Dec '11

Hi, this issue somehow looks familiar but before it gets lost I'll post it here. ATM binutils exists in core and testing. The core package has the base and the testing one the base-devel group. There is also a versioned dep from gcc to it. Now if you try to install both groups (as done in devtools) pacman fails with error: failed to prepare transaction (could not satisfy dependencies) :: gcc: requires binutils>=2.22 You can check for yourself by running "pacman -S --needed base base-devel" Greetings, Pierre -- Pierre Schmitz, http://pierre-schmitz.com

1 1

[pacman-dev] Multiple Keyservers?
by Kevin Chadwick 06 Dec '11

06 Dec '11

I had some keys for the community repo coming back unknown. I added a second keyserver line (hkp://pgp.mit.edu) to pacman-keys gpg config. It worked but I'm not sure if it was just a temporary timeout issue or it tried both? Might be a good idea to have a second one? I could check my logs if need be, but haven't?

2 1

[pacman-dev] [PATCH 1/2] Enforce signature download size limit on -U <url> operations
by Dan McGee 05 Dec '11

05 Dec '11

We had a 16 KiB limit on database signatures, we should do the same here too to have a slight sanity check, even if we can't do so for the package itself yet. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- lib/libalpm/dload.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index efd469d..2928590 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -604,6 +604,9 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) payload.force = 1; payload.errors_ok = (handle->siglevel & ALPM_SIG_PACKAGE_OPTIONAL); + /* set hard upper limit of 16KiB */ + payload.max_size = 16 * 1024; + ret = _alpm_download(&payload, cachedir, &sig_final_file); if(ret == -1 && !payload.errors_ok) { _alpm_log(handle, ALPM_LOG_WARNING, -- 1.7.8

3 3

[pacman-dev] [PATCH] contrib/paclist: Add "--help" command line parameter
by Lukas Fleischer 05 Dec '11

05 Dec '11

Be consistent with all other contrib scripts and support the "--help" command line switch. Fixes FS#27258. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- contrib/paclist.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/paclist.in b/contrib/paclist.in index 84144f7..06b06f2 100755 --- a/contrib/paclist.in +++ b/contrib/paclist.in @@ -27,7 +27,7 @@ if ! type gettext &>/dev/null; then } fi -if [[ -z $1 ]]; then +if [[ -z $1 || $1 = -@(h|-help) ]]; then printf '%s - List all packages installed from a given repo\n' "${0##*/}" printf 'Usage: %s <repo>\n' "${0##*/}" printf 'Example: %s testing\n' "${0##*/}" -- 1.7.7.4

3 6

[pacman-dev] Accepting patches on github
by John Sumsion 03 Dec '11

03 Dec '11

I saw that several people have submitted patches on github. But when I follow a link to their repos, it's always a 404, so I'm assuming you prefer patches in email. So I'll send a couple through email. NOTE: I couldn't find any statement of policy on accepting patches through github; this search didn't turn anything obvious up: http://www.google.com/search?q=site%3Amailman.archlinux.org+pacman+github+r… It would be good to state your policy on accepting commits through github here: http://www.archlinux.org/pacman/submitting-patches.html John...

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.1-62-g1d98c63
by dan＠archlinux.org 01 Dec '11

01 Dec '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 1d98c6347c9622d4334f80fc59623da524b4f37b (commit) via 5490cd6eb22752d2eac5410152d239c50224dbc1 (commit) via a521cea96f24ba9d060e019c74ccbe63a1e06392 (commit) via 15aa57d51b4f7f49d55912650ed13ce573f1e946 (commit) via d7f8838294fc3567fec8fa9521ab9f91d9897829 (commit) via f5820c8bd61caafd62d370a24136d3ee90714ac8 (commit) via 86b5b7aa4215b7408ccf1ec8368988af327703fb (commit) via 77af613efc8b4c99115fdf81f8284955b1e95da6 (commit) from 96b3ba3470f11842312e4fdb34b74b391842fc33 (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 1d98c6347c9622d4334f80fc59623da524b4f37b Merge: 86b5b7a 5490cd6 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 30 22:34:25 2011 -0600 Merge branch 'maint' commit 86b5b7aa4215b7408ccf1ec8368988af327703fb Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 30 21:04:16 2011 -0600 Add helper function for duplicating depends lists We do this in several of the package duplication steps; add a helper function for doing so to reduce some of the repetitive code. Also add a free_deplist function for our repeated depend list free calls of both the data and the list. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 77af613efc8b4c99115fdf81f8284955b1e95da6 Author: andrew.gregory.8(a)gmail.com <andrew.gregory.8(a)gmail.com> Date: Tue Nov 22 00:35:46 2011 -0500 added doxygen documentation Made existing documentation more consistent and added documentation where there was none. One function still needs documentation and is marked with 'TODO'. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 3 +- doc/makepkg.conf.5.txt | 2 +- lib/libalpm/package.c | 58 +++++++++------- lib/libalpm/util.c | 154 +++++++++++++++++++++++++++++++++-------- lib/libalpm/util.h | 2 +- scripts/makepkg.sh.in | 16 +++-- scripts/po/fi.po | 14 ++-- src/pacman/po/fi.po | 8 +- test/pacman/tests/sync303.py | 38 ++++++++++ test/pacman/tests/sync304.py | 27 +++++++ 10 files changed, 244 insertions(+), 78 deletions(-) create mode 100644 test/pacman/tests/sync303.py create mode 100644 test/pacman/tests/sync304.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.1-5-g5490cd6
by dan＠archlinux.org 01 Dec '11

01 Dec '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 5490cd6eb22752d2eac5410152d239c50224dbc1 (commit) via a521cea96f24ba9d060e019c74ccbe63a1e06392 (commit) via 15aa57d51b4f7f49d55912650ed13ce573f1e946 (commit) via d7f8838294fc3567fec8fa9521ab9f91d9897829 (commit) via f5820c8bd61caafd62d370a24136d3ee90714ac8 (commit) from 507a2d15e65aba93a20ee99d90345917866407dc (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 5490cd6eb22752d2eac5410152d239c50224dbc1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Nov 23 08:23:50 2011 -0500 makepkg.5: fix typo s/tar,bz2/tar.bz2/ Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a521cea96f24ba9d060e019c74ccbe63a1e06392 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 21 23:03:33 2011 -0500 makepkg: avoid using comm for diff'ing package lists Whereas comm will check inputs to see if they're sorted (and warn when they aren't), grep doesn't even care about ordering. In this particular instance -- neither do we. We're only interested that the two lists are equivalent. Fixes FS#26580. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 15aa57d51b4f7f49d55912650ed13ce573f1e946 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 22:29:00 2011 -0600 _alpm_ldconfig: return value from _alpm_run_chroot Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d7f8838294fc3567fec8fa9521ab9f91d9897829 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 20:31:17 2011 -0600 Add two new pactests for pacman upgrade behavior Both currently marked as failing. * sync303.py encapsulates the broken behavior reported in FS#27214. * sync304.py shows how packages depending on a specific version of a package in SyncFirst can cause breakage of the dependency resolver. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5820c8bd61caafd62d370a24136d3ee90714ac8 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 21 20:35:04 2011 -0600 Miscellaneous post-4.0.1 updates Some late-arriving translation updates and add the correct dates to the index.txt releases table. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/index.txt | 3 ++- doc/makepkg.conf.5.txt | 2 +- lib/libalpm/util.c | 2 +- scripts/makepkg.sh.in | 16 +++++++++------- scripts/po/fi.po | 14 +++++++------- src/pacman/po/fi.po | 8 ++++---- test/pacman/tests/sync303.py | 38 ++++++++++++++++++++++++++++++++++++++ test/pacman/tests/sync304.py | 27 +++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 21 deletions(-) create mode 100644 test/pacman/tests/sync303.py create mode 100644 test/pacman/tests/sync304.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 00/14] Full optdep support
by Benedikt Morbach 01 Dec '11

01 Dec '11

Now that 4.0/4.0.1 is out, I thought it might be time to finally send these patches in for review. This will probably still need some polish (maybe quite a bit in some places) but it works quite well and I have been using it for some time. The code is also at https://github.com/moben/pacman branch:optdep And now, please review ald yell at my bad code :) --- Benedikt Benedikt Morbach (14): Split optdep into alpm_depend_t and description Hook new optdepend structures up Only display uninstalled optdepends during install/upgrade Add option for showing all optdeps again Show optdep install status in package info optdepends are not orphans unless --optdeps is specified Make package info show optional requirements Make recursive removal consider optdepends Show list of optrequires with -Qtdn Warn on optdep removal Add flag to recurse through optdepends Add option to install all optdepends by default Add option to ask which optdeps to install Make HandleOptdeps Ask and Install work together better doc/pacman.8.txt | 11 +++ doc/pacman.conf.5.txt | 14 +++ etc/pacman.conf.in | 2 + lib/libalpm/add.c | 4 +- lib/libalpm/alpm.h | 25 +++++- lib/libalpm/be_local.c | 12 ++- lib/libalpm/be_package.c | 5 +- lib/libalpm/be_sync.c | 8 ++- lib/libalpm/deps.c | 127 ++++++++++++++++++++++++++--- lib/libalpm/deps.h | 5 +- lib/libalpm/error.c | 2 + lib/libalpm/package.c | 40 ++++++--- lib/libalpm/remove.c | 22 ++++- lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 10 ++- src/pacman/conf.c | 27 ++++++ src/pacman/conf.h | 10 ++ src/pacman/package.c | 24 ++++- src/pacman/pacman.c | 7 ++ src/pacman/query.c | 27 +++++- src/pacman/remove.c | 23 ++++- src/pacman/sync.c | 125 +++++++++++++++++++++++++++-- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 177 ++++++++++++++++++++++++++++++++++------ src/pacman/util.h | 5 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- test/pacman/tests/query010.py | 12 +++ test/pacman/tests/query011.py | 15 ++++ test/pacman/tests/query012.py | 13 +++ test/pacman/tests/query020.py | 14 +++ test/pacman/tests/query021.py | 14 +++ test/pacman/tests/query022.py | 14 +++ test/pacman/tests/remove053.py | 15 ++++ test/pacman/tests/remove054.py | 14 +++ test/pacman/tests/remove055.py | 20 +++++ test/pacman/tests/remove056.py | 20 +++++ test/pacman/tests/sync060.py | 12 +++ test/pacman/tests/sync061.py | 15 ++++ test/pacman/tests/sync062.py | 17 ++++ test/pacman/tests/sync063.py | 17 ++++ 41 files changed, 839 insertions(+), 93 deletions(-) create mode 100644 test/pacman/tests/query010.py create mode 100644 test/pacman/tests/query011.py create mode 100644 test/pacman/tests/query012.py create mode 100644 test/pacman/tests/query020.py create mode 100644 test/pacman/tests/query021.py create mode 100644 test/pacman/tests/query022.py create mode 100644 test/pacman/tests/remove053.py create mode 100644 test/pacman/tests/remove054.py create mode 100644 test/pacman/tests/remove055.py create mode 100644 test/pacman/tests/remove056.py create mode 100644 test/pacman/tests/sync060.py create mode 100644 test/pacman/tests/sync061.py create mode 100644 test/pacman/tests/sync062.py create mode 100644 test/pacman/tests/sync063.py -- 1.7.7.3

4 24

[pacman-dev] Do you want Heads Ups about the Signing System
by Kevin Chadwick 30 Nov '11

30 Nov '11

Hi I'm new to arch but I've got automatic sig checks by pacman running fine so far on stable with just pacman4 from testing set to Optional (for the databases) TrustedOnly. I just had to tsign Ionuts master key with mine manually and also Allan Mcraes which seems to be unsigned by the Arch Linux Master keys oh and now also Ronald van Harens. I haven't tried many packages but when tryinh abs which is unsigned it went fine but the signed rsync threw angel velasquez angvp(a)archlinux.org is unknown trust. It appears to be signed by Pierre's Master key which I have lsigned with no luck. Not sure if you find these reports useful or just annoying until launch so let me know for any others I find. Looks like a good highly adaptable system :-)

2 1

[pacman-dev] Localization issues (Attention Developers)
by atilla ontas 27 Nov '11

27 Nov '11

Hi. I' m an experienced translator from Turkey. Contributing Arch turkish translations for a while. I have noticed today; some strings in pacman-scripts are very hard to translate. You see, Turkic languages are very differ from Latin origin languages; structure of sentence is almost reversed. So, using multiple "%s" variables in source string makes a lot of trouble. It is hard to translate and translated strings are hard to understand for native Turkish speakers. For example; "Running %s as an unprivileged user will result in non-root\nownership of the packaged files. Try using the %s environment by\nplacing %s in the %s array in %s." will translated into turkish properly, if second, third, fourth and fifth %s variables are supposed to %d, %n, %f, %z : "%s uygulamasını yetkisiz kullanıcı olarak çalıştırmak paketlenmiş dosyaların kök olmayan sahiplik almasına yol açacaktır. %z dosyası içindeki %f satırına %n değerini yerleştirerek %d ortamını kullanmayı deneyin." You see, how variables reversed? So if you, developers, mind to and if it is possible use only one %s in a string it will be much appreciated. Also, if you, developers, mind to add comments what is %s (a command, an application, what??) it will be great help to translators. Greetings...

3 9

[pacman-dev] [PATCH] makepkg.5: fix typo s/tar,bz2/tar.bz2/
by Dave Reisner 23 Nov '11

23 Nov '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- doc/makepkg.conf.5.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index 2778361..db1e6d5 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -215,7 +215,7 @@ Options **PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz":: Sets the compression used when making compiled or source packages. The - current valid suffixes are `.tar`, `.tar.gz`, `.tar,bz2`, `.tar.xz`, and + current valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, and `.tar.Z`. Do not touch these unless you know what you are doing. -- 1.7.7.4

1 0

[pacman-dev] [PATCH] makepkg: avoid using comm for diff'ing package lists
by Dave Reisner 22 Nov '11

22 Nov '11

Whereas comm will check inputs to see if they're sorted (and warn when they aren't), grep doesn't even care about ordering. In this particular instance -- neither do we. We're only interested that the two lists are equivalent. Fixes FS#26580. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- scripts/makepkg.sh.in | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 26a2789..0fa05dc 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,15 +506,17 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}")) ]]; then - warning "$(gettext "Failed to remove installed dependencies.")" - return 0 + if [[ -n $(grep -xvFf <(printf '%s\n' "${current_packagelist[@]}") \ + <(printf '%s\n' "${original_packagelist[@]}") ) ]]; then + warning "$(gettext "Failed to remove installed dependencies.")" + return 0 fi - local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ - <(printf "%s\n" "${current_pkglist[@]}"))) - (( ${#deplist[@]} == 0 )) && return + local deplist + if ! deplist=($(grep -xvFf <(printf "%s\n" "${original_pkglist[@]}") \ + <(printf "%s\n" "${current_pkglist[@]}"))); then + return + fi msg "Removing installed dependencies..." # exit cleanly on failure to remove deps as package has been built successfully -- 1.7.7.4

3 4

[pacman-dev] [PATCH] makepkg: Use LC_COLLATE=C for comm command
by Allan McRae 22 Nov '11

22 Nov '11

Commit 3e4d2c3a reverted the use of strcoll in sorting package names, which results in potentially different package orders from pacman -Qq and that expected by comm. Use LC_COLLATE=C for the comm commands in makepkg. Fixes FS#27221. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index f39e9d1..4089e30 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -506,13 +506,13 @@ remove_deps() { # check for packages removed during dependency install (e.g. due to conflicts) # removing all installed packages is risky in this case - if [[ -n $(comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ + if [[ -n $(LC_COLLATE=C comm -23 <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}")) ]]; then warning "$(gettext "Failed to remove installed dependencies.")" return 0 fi - local deplist=($(comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ + local deplist=($(LC_COLLATE=C comm -13 <(printf "%s\n" "${original_pkglist[@]}") \ <(printf "%s\n" "${current_pkglist[@]}"))) (( ${#deplist[@]} == 0 )) && return -- 1.7.7.4

1 0