- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/2] repo-add: ensure path to LOCKFILE is always absolute
by Dan McGee 20 Nov '11

20 Nov '11

Given our semi-frequent use of pushd/popd, if we are in any directory but the original and the database path given was relative, we won't unlock the database file when cleaning up after an error. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- scripts/repo-add.sh.in | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fc008fc..280c024 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -411,13 +411,8 @@ elephant() { check_repo_db() { local repodir - # ensure the path to the DB exists - if [[ "$LOCKFILE" == /* ]]; then - repodir=${LOCKFILE%/*}/ - else - repodir=$PWD/$LOCKFILE - repodir=${repodir%/*}/ - fi + # ensure the path to the DB exists; $LOCKFILE is always an absolute path + repodir=${LOCKFILE%/*}/ if [[ ! -d "$repodir" ]]; then error "$(gettext "%s does not exist or is not a directory.")" "$repodir" @@ -624,7 +619,11 @@ if [[ -z $REPO_DB_FILE ]]; then exit 1 fi -LOCKFILE=$REPO_DB_FILE.lck +if [[ $REPO_DB_FILE == /* ]]; then + LOCKFILE=$REPO_DB_FILE.lck +else + LOCKFILE=$PWD/$REPO_DB_FILE.lck +fi verify_repo_extension "$REPO_DB_FILE" >/dev/null check_repo_db -- 1.7.7.3

2 3

[pacman-dev] [PATCH] makepkg: trim trailing space from whitespace sensitive vars
by Dave Reisner 20 Nov '11

20 Nov '11

Declarations such as: pkgver=2.11 # foo will work, but trimming off the comment (without trimming the trailing whitespace) will result in an incorrect validation error. Bash automatically trims this trailing whitespace and does the right thing under the covers, so we should honor this as well. NB: We don't need to worry about leading whitespace because it will cause a syntax error (when unquoted), or fail validation (when quoted). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Too late to squeeze this into maint? 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 085fbb9..39ce017 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1441,7 +1441,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgver$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]:-]* ]]; then error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" return 1 @@ -1450,7 +1450,7 @@ check_sanity() { awk -F'=' '$1 ~ /^[[:space:]]*pkgrel$/' "$BUILDFILE" | sed "s/[[:space:]]*#.*//" | while IFS='=' read -r _ i; do - eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "$i")\" + eval i=\"$(sed 's/^$['\''"]$$.*$\1$/\2/' <<< "${i%%+([[:space:]])}")\" if [[ $i = *[[:space:]-]* ]]; then error "$(gettext "%s is not allowed to contain hyphens or whitespace.")" "pkgrel" return 1 -- 1.7.7.3

4 5

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

17 Nov '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 Dave as I reused the size_to_human function from his paccache script. Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- If you can think of a better name, feel free to suggest one. --- contrib/.gitignore | 1 + contrib/Makefile.am | 5 ++- contrib/pacsysclean.in | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 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 10b03a2..754096d 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..e393e24 --- /dev/null +++ b/contrib/pacsysclean.in @@ -0,0 +1,87 @@ +#!/bin/bash + +# pacsysclean - Sort installed packages by decreasing installed size. Useful for system clean-up. +# +# Copyright (C) 2011 Eric Bélanger <eric(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +export TEXTDOMAIN='pacman' +export TEXTDOMAINDIR='/usr/share/locale' + +# determine whether we have gettext; make it a no-op if we do not +if ! type gettext &>/dev/null; then + gettext() { + echo "$@" + } +fi + +usage() { + echo "$0 - Sort installed packages by decreasing installed size." + echo + echo "Usage: $0 [options]" + echo + echo "Options:" + echo " -a List all packages (Default)" + echo " -e List unrequired explicitely installed packages" + echo " -h, --help Show this help message and exit" +} + +size_to_human() { + awk -v size="$1" ' + BEGIN { + suffix[1] = "KiB" + suffix[2] = "MiB" + suffix[3] = "GiB" + suffix[4] = "TiB" + count = 1 + + while (size > 1024) { + size /= 1024 + count++ + } + + sizestr = sprintf("%.2f", size) + sub(/.?0+$/, "", sizestr) + printf("%s %s", sizestr, suffix[count]) + }' +} + +PACMAN_OPTS="-Qq" +if [ -n "$1" ]; then + case "$1" in + -a) PACMAN_OPTS="-Qq" ;; + -e) PACMAN_OPTS="-Qetq" ;; + -h|--help) usage; exit 0 ;; + *) usage; exit 1 ;; + esac +fi + +TEMPDIR=$(mktemp -d /tmp/cleanup-script.XXXX) +cd $TEMPDIR + +# Sort installed packages by decreasing installed size. Useful for system clean-up. +for package in $(pacman $PACMAN_OPTS); do + echo $(pacman -Qi $package |grep 'Installed Size' |awk '{print $4}') $package +done | sort -g -r -o raw.txt + +N=0 +while read LINE ; do + N=$((N+1)) + size_to_human $(echo -n $LINE |cut -d' ' -f1) >> sorted-list.txt + echo -n ' : ' >> sorted-list.txt + echo -n $LINE |cut -d' ' -f2 >> sorted-list.txt +done < raw.txt + +echo "Files saved to $TEMPDIR" -- 1.7.6

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-88-g919b604
by dan＠archlinux.org 16 Nov '11

16 Nov '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 919b604c29060b3b14162ef331dfccc018606919 (commit) via dee8144ce5ca96ceca643d74fd6152ecf812f8af (commit) via c79c068fe9b80ea9af831c8c883f27fad2e0d128 (commit) via ad09db3c55a4b9e4989704e04860c5dda7c25fb0 (commit) via 9363e7dc22f85c549cd90768ce884508901820a8 (commit) via 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 (commit) via c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d (commit) via fcf0a8b20328c57996ff61247d5ff4b13356f72a (commit) from f1ec3b9b10d1657412d6592180c56887c3a6ae20 (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 919b604c29060b3b14162ef331dfccc018606919 Merge: dee8144 c79c068 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Nov 16 14:51:17 2011 -0600 Merge branch 'maint' commit dee8144ce5ca96ceca643d74fd6152ecf812f8af Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 13 23:45:55 2011 -0600 Add helper method for creating and opening archive object This moves the common setup code of about 5 different callers into one method. Error messages will now be common and shared in all places; several paths did not have any messages at all before. In addition, we now pick an ideal block size for the archive read based off the larger value of our default buffer size or the st.st_blksize field. For a filesystem such as NFS, this is often much larger than the default 8192- values such as 32768 and 131072 are common. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 10 ++ configure.ac | 5 +- doc/PKGBUILD.5.txt | 2 +- etc/makepkg.conf.in | 2 +- lib/libalpm/add.c | 22 ++-- lib/libalpm/be_package.c | 70 +++++----- lib/libalpm/be_sync.c | 23 +--- lib/libalpm/deps.c | 2 +- lib/libalpm/po/ca.po | 2 +- lib/libalpm/po/cs.po | 17 ++-- lib/libalpm/po/da.po | 8 +- lib/libalpm/po/de.po | 2 +- lib/libalpm/po/el.po | 2 +- lib/libalpm/po/en_GB.po | 2 +- lib/libalpm/po/es.po | 2 +- lib/libalpm/po/fi.po | 2 +- lib/libalpm/po/fr.po | 2 +- lib/libalpm/po/hu.po | 2 +- lib/libalpm/po/it.po | 2 +- lib/libalpm/po/kk.po | 8 +- lib/libalpm/po/libalpm.pot | 4 +- lib/libalpm/po/lt.po | 4 +- lib/libalpm/po/nb.po | 173 +++++++++++++------------- lib/libalpm/po/pl.po | 2 +- lib/libalpm/po/pt.po | 2 +- lib/libalpm/po/pt_BR.po | 8 +- lib/libalpm/po/ro.po | 2 +- lib/libalpm/po/ru.po | 8 +- lib/libalpm/po/sk.po | 2 +- lib/libalpm/po/sr.po | 2 +- lib/libalpm/po/sr(a)latin.po | 2 +- lib/libalpm/po/sv.po | 67 +++++----- lib/libalpm/po/tr.po | 8 +- lib/libalpm/po/uk.po | 2 +- lib/libalpm/po/zh_CN.po | 6 +- lib/libalpm/po/zh_TW.po | 8 +- lib/libalpm/sync.c | 27 +++-- lib/libalpm/util.c | 95 +++++++++++---- lib/libalpm/util.h | 3 + scripts/po/ca.po | 13 ++- scripts/po/cs.po | 18 ++- scripts/po/da.po | 22 ++-- scripts/po/de.po | 16 ++- scripts/po/el.po | 21 +++- scripts/po/en_GB.po | 14 ++- scripts/po/es.po | 15 ++- scripts/po/fi.po | 145 +++++++++++++-------- scripts/po/fr.po | 13 ++- scripts/po/hu.po | 15 ++- scripts/po/it.po | 13 ++- scripts/po/kk.po | 22 ++-- scripts/po/lt.po | 15 ++- scripts/po/nb.po | 104 +++++++++------- scripts/po/pacman-scripts.pot | 13 ++- scripts/po/pl.po | 76 +++++++----- scripts/po/pt.po | 281 +++++++++++++++++++++++++++-------------- scripts/po/pt_BR.po | 13 ++- scripts/po/ro.po | 16 ++- scripts/po/ru.po | 107 +++++++++------- scripts/po/sk.po | 15 ++- scripts/po/sr.po | 13 ++- scripts/po/sr(a)latin.po | 13 ++- scripts/po/sv.po | 22 ++-- scripts/po/tr.po | 224 ++++++++++++++++++++------------- scripts/po/uk.po | 79 +++++++----- scripts/po/zh_CN.po | 13 ++- scripts/po/zh_TW.po | 13 ++- src/pacman/po/ca.po | 66 ++++++----- src/pacman/po/cs.po | 38 +++--- src/pacman/po/da.po | 58 +++++----- src/pacman/po/de.po | 17 ++-- src/pacman/po/el.po | 13 +- src/pacman/po/en_GB.po | 12 +- src/pacman/po/es.po | 16 ++-- src/pacman/po/fi.po | 123 +++++++++--------- src/pacman/po/fr.po | 12 +- src/pacman/po/hu.po | 14 +- src/pacman/po/it.po | 14 +- src/pacman/po/kk.po | 15 +-- src/pacman/po/lt.po | 124 +++++++++--------- src/pacman/po/nb.po | 14 +- src/pacman/po/pacman.pot | 8 +- src/pacman/po/pl.po | 85 +++++++------ src/pacman/po/pt.po | 15 ++- src/pacman/po/pt_BR.po | 12 +- src/pacman/po/ro.po | 14 +- src/pacman/po/ru.po | 15 +-- src/pacman/po/sk.po | 14 +- src/pacman/po/sr.po | 14 ++- src/pacman/po/sr(a)latin.po | 12 +- src/pacman/po/sv.po | 217 ++++++++++++++++---------------- src/pacman/po/tr.po | 30 ++--- src/pacman/po/uk.po | 14 +- src/pacman/po/zh_CN.po | 8 +- src/pacman/po/zh_TW.po | 26 ++--- 95 files changed, 1723 insertions(+), 1253 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.0.0-42-gc79c068
by dan＠archlinux.org 16 Nov '11

16 Nov '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 c79c068fe9b80ea9af831c8c883f27fad2e0d128 (commit) via ad09db3c55a4b9e4989704e04860c5dda7c25fb0 (commit) via 9363e7dc22f85c549cd90768ce884508901820a8 (commit) via 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 (commit) from c0ce10397a8ef4811cdde6f727a3fdd3890e8a5d (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 c79c068fe9b80ea9af831c8c883f27fad2e0d128 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 23:16:28 2011 -0600 Update translations from Transifex Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ad09db3c55a4b9e4989704e04860c5dda7c25fb0 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Nov 15 10:20:07 2011 -0500 makepkg.conf: disable motd printing for rsync DLAGENT Fixes FS#26806. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9363e7dc22f85c549cd90768ce884508901820a8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 09:12:18 2011 -0600 Allow sync_prepare to work in certain cases without sync databases When doing a bare -U operation on a local package that doesn't pull in any dependencies from the sync databases, we can get away with missing database files. This makes the check conditional on no sync targets found in the target list. This is not the prettiest code here so we have a bit of hackish behavior required to straighten both the behavior and the nonsensical error message out. Addresses FS#26899. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 37ff0f5658e356a4fbd9ad212ccab2acb0d9bb46 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Nov 15 10:58:06 2011 +1000 Update documentation regarding signature extensions Commit e7b56f48 allowed makepkg to handle pgp signatures with the .sign extension. Update the man page to reflect this. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/PKGBUILD.5.txt | 2 +- etc/makepkg.conf.in | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/po/sv.po | 63 +++++++------- lib/libalpm/po/zh_CN.po | 4 +- lib/libalpm/sync.c | 27 ++++-- scripts/po/ca.po | 10 +- scripts/po/de.po | 11 ++- scripts/po/el.po | 8 +- scripts/po/fr.po | 8 +- scripts/po/it.po | 8 +- scripts/po/nb.po | 8 +- scripts/po/pt.po | 54 ++++++++----- scripts/po/ro.po | 11 ++- scripts/po/ru.po | 97 +++++++++++---------- scripts/po/sr.po | 8 +- scripts/po/sr(a)latin.po | 10 +- scripts/po/tr.po | 43 ++++++--- scripts/po/zh_CN.po | 10 +- src/pacman/po/ca.po | 2 +- src/pacman/po/de.po | 11 ++- src/pacman/po/el.po | 9 +- src/pacman/po/fr.po | 8 +- src/pacman/po/it.po | 10 +- src/pacman/po/nb.po | 8 +- src/pacman/po/pl.po | 8 +- src/pacman/po/pt.po | 9 +- src/pacman/po/ro.po | 8 +- src/pacman/po/sr.po | 8 +- src/pacman/po/sr(a)latin.po | 8 +- src/pacman/po/sv.po | 208 +++++++++++++++++++++++---------------------- src/pacman/po/tr.po | 8 +- src/pacman/po/zh_CN.po | 8 +- 33 files changed, 377 insertions(+), 322 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg.conf: disable motd printing for rsync DLAGENT
by Dave Reisner 16 Nov '11

16 Nov '11

Fixes FS#26806. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- Dear Sirs, It is with great auspiciousness and delight that I present to you this most complex work of art for which many candles were burned into the night. I implore all of you to review my work as I'm sure that the slightest breeze may alter something as subtle as the font encoding, thereby hindering application of this most vital of vital patches. With humble regards, Sir David McPatcherton, Jr, III of Crapsville etc/makepkg.conf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 65d8ab9..e9152c8 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -11,7 +11,7 @@ DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' 'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' 'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u' - 'rsync::/usr/bin/rsync -z %u %o' + 'rsync::/usr/bin/rsync --no-motd -z %u %o' 'scp::/usr/bin/scp -C %u %o') # Other common tools: -- 1.7.7.3

2 1

[pacman-dev] [PATCH] repo-add: ensure database and signature files are always viewed in whole
by Dan McGee 16 Nov '11

16 Nov '11

This addresses a short but sweet race condition currently existing in repo-add and repo-remove. We do the smart thing and zip the database to a location in a temporary directory. However, we then proceed to move this file directly from the temporary directory to our final location, which is more than likely a cross-filesystem move (/tmp on tmpfs) and thus non-atomic. Instead, break the move into two parts- first, move the file to a name with a '.tmp.' prefix in the correct directory, then move it to the correct name. This second move is guaranteed to be atomic, so any reader of the database file will get either the old version, the new version, or a file that doesn't exist. We also perform a hardlink if possible instead of a move when shifting the old database out of the way; this ensures there is no chance of a database file not existing during the whole process. Only one small race condition should now be present- when the database has been fully moved into place and th signature has not, you may see a mismatch. There seems to be no good way to address this, and it existed before this patch. A final note- if someone had locked-down permissions on the directory that the database files are in (e.g., could only write to foo.db.tar.gz, foo.db, foo.db.tar.gz.old, foo.db.old, and the lock file), this would break. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- As I was writing the commit message for this I also realized we could just `bsdtar cf` straight to the '.tmp.' prefix and save ourselves a copy- this probably makes more sense. Thoughts on the general ideas of the patch, besides the above simplification? scripts/repo-add.sh.in | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index fc008fc..d3e72fd 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -655,14 +655,26 @@ if (( success )); then create_signature "$tmpdir/$filename" - [[ -f $REPO_DB_FILE ]] && mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + if [[ -f $REPO_DB_FILE ]]; then + ln -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" 2>/dev/null || \ + mv -f "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + fi if [[ -f $REPO_DB_FILE.sig ]]; then - mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" + ln -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" 2>/dev/null || \ + mv -f "$REPO_DB_FILE.sig" "$REPO_DB_FILE.old.sig" else rm -f "$REPO_DB_FILE.old.sig" fi - [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" - [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" + + # These odd double-moves ensure the database and signature files are seen all + # or nothing and not halfway through a filesystem to filesystem copy. + mv "$tmpdir/$filename" ".tmp.$REPO_DB_FILE" + mv ".tmp.$REPO_DB_FILE" "$REPO_DB_FILE" + if [[ -f $tmpdir/$filename.sig ]]; then + mv "$tmpdir/$filename.sig" ".tmp.$REPO_DB_FILE.sig" + mv ".tmp.$REPO_DB_FILE.sig" "$REPO_DB_FILE.sig" + fi + dblink="${REPO_DB_FILE%.tar*}" target=${REPO_DB_FILE##*/} rm -f "$dblink" "$dblink.sig" -- 1.7.7.3

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.0.0-80-gf1ec3b9
by dan＠archlinux.org 15 Nov '11

15 Nov '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 f1ec3b9b10d1657412d6592180c56887c3a6ae20 (commit) via a3f9399295e6c94b7f8f8249d4a6b28e63fd2dbb (commit) from 1de5070bb39e56ee9ce381b0cc40752eaed60783 (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 f1ec3b9b10d1657412d6592180c56887c3a6ae20 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 15 09:11:03 2011 -0600 Remove unnecessary casts in callback code Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a3f9399295e6c94b7f8f8249d4a6b28e63fd2dbb Author: Jonathan Conder <jonno.conder(a)gmail.com> Date: Sat Oct 29 15:03:24 2011 +1300 create a typedef for enum _alpm_errno_t This is consistent with the other enums and structs, and should be slightly more readable. Signed-off-by: Jonathan Conder <jonno.conder(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/alpm.h | 10 +++++----- lib/libalpm/error.c | 4 ++-- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 4 ++-- lib/libalpm/sync.c | 4 ++-- src/pacman/callback.c | 12 ++++++------ src/pacman/conf.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sync.c | 6 +++--- src/pacman/util.c | 2 +- src/util/cleanupdelta.c | 2 +- src/util/pactree.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- 16 files changed, 31 insertions(+), 31 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Recreate empty missing filesystem directories
by Dan McGee 15 Nov '11

15 Nov '11

This is fixed in pacman 4.0, but thought people might find this super simple script helpful. A lot of people will find `/etc/cron.hourly/` missing due to the removal of the adjtime cronjob; but at least on my system there were a few more missing directories found. $ sudo /tmp/find-missing-dirs.sh Password: /usr/share/icons/hicolor/16x16/devices/ /usr/share/icons/hicolor/22x22/devices/ /usr/share/icons/hicolor/32x32/devices/ $ sudo /tmp/find-missing-dirs.sh | xargs sudo mkdir $ sudo /tmp/find-missing-dirs.sh -Dan $ cat /tmp/find-missing-dirs.sh #!/bin/bash IFS=$'\n' for path in $(pacman -Qql | grep '/$' | sort | uniq); do if [[ ! -d $path ]]; then echo $path fi done

1 0

[pacman-dev] [PATCH] Allow sync_prepare to work in certain cases without sync databases
by Dan McGee 15 Nov '11

15 Nov '11

When doing a bare -U operation on a local package that doesn't pull in any dependencies from the sync databases, we can get away with missing database files. This makes the check conditional on no sync targets found in the target list. This is not the prettiest code here so we have a bit of hackish behavior required to straighten both the behavior and the nonsensical error message out. Addresses FS#26899. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. Some example behavior: $ sudo ./src/pacman/pacman -U /home/makepkg/packages/pacman-git-20111115-1-x86_64.pkg.tar.xz warning: database file for 'testing' does not exist loading packages... resolving dependencies... looking for inter-conflicts... Targets (1): Name Old Version New Version Net Change pacman-git 20111014-1 20111115-1 0.03 MiB Total Installed Size: 5.46 MiB Net Upgrade Size: 0.03 MiB Proceed with installation? [Y/n] y (1/1) checking package integrity [----------------------] 100% (1/1) loading package files [----------------------] 100% (1/1) checking for file conflicts [----------------------] 100% (1/1) checking available disk space [----------------------] 100% (1/1) upgrading pacman-git [----------------------] 100% $ sudo ./src/pacman/pacman -U /tmp/couchdb-1.1.1-1-x86_64.pkg.tar.xz warning: database file for 'testing' does not exist warning: database file for 'extra' does not exist loading packages... resolving dependencies... warning: cannot resolve "erlang", a dependency of "couchdb" warning: cannot resolve "js", a dependency of "couchdb" :: The following package cannot be upgraded due to unresolvable dependencies: couchdb Do you want to skip the above package for this upgrade? [y/N] n error: failed to prepare transaction (could not satisfy dependencies) :: couchdb: requires erlang :: couchdb: requires js $ sudo ./src/pacman/pacman -S couchdb warning: database file for 'testing' does not exist warning: database file for 'extra' does not exist error: failed to prepare transaction (could not find database) lib/libalpm/deps.c | 2 +- lib/libalpm/sync.c | 27 ++++++++++++++++++--------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 6040158..89f6d69 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -631,7 +631,7 @@ static alpm_pkg_t *resolvedep(alpm_handle_t *handle, alpm_depend_t *dep, /* first check if one provider is already installed locally */ for(i = providers; i; i = i->next) { alpm_pkg_t *pkg = i->data; - if(_alpm_pkghash_find(_alpm_db_get_pkgcache_hash(handle->db_local), pkg->name)) { + if(_alpm_db_get_pkgfromcache(handle->db_local, pkg->name)) { alpm_list_free(providers); return pkg; } diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 54b9794..cf20971 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -357,7 +357,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_list_t *i, *j; alpm_list_t *deps = NULL; alpm_list_t *unresolvable = NULL; - alpm_list_t *remove = NULL; + size_t from_sync = 0; int ret = 0; alpm_trans_t *trans = handle->trans; @@ -365,19 +365,27 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) *data = NULL; } - /* ensure all sync database are valid since we will be using them */ + for(i = trans->add; i; i = i->next) { + alpm_pkg_t *spkg = i->data; + from_sync += (spkg->origin == PKG_FROM_SYNCDB); + } + + /* ensure all sync database are valid if we will be using them */ for(i = handle->dbs_sync; i; i = i->next) { const alpm_db_t *db = i->data; if(db->status & DB_STATUS_INVALID) { RET_ERR(handle, ALPM_ERR_DB_INVALID, -1); } - if(db->status & DB_STATUS_MISSING) { + /* missing databases are not allowed if we have sync targets */ + if(from_sync && db->status & DB_STATUS_MISSING) { RET_ERR(handle, ALPM_ERR_DB_NOT_FOUND, -1); } } if(!(trans->flags & ALPM_TRANS_FLAG_NODEPS)) { - alpm_list_t *resolved = NULL; /* target list after resolvedeps */ + alpm_list_t *resolved = NULL; + alpm_list_t *remove = NULL; + alpm_list_t *localpkgs; /* Build up list by repeatedly resolving each transaction package */ /* Resolve targets dependencies */ @@ -394,7 +402,7 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) /* Compute the fake local database for resolvedeps (partial fix for the * phonon/qt issue) */ - alpm_list_t *localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), + localpkgs = alpm_list_diff(_alpm_db_get_pkgcache(handle->db_local), trans->add, _alpm_pkg_cmp); /* Resolve packages in the transaction one at a time, in addition @@ -409,11 +417,13 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) dependencies not already on the list */ } alpm_list_free(localpkgs); + alpm_list_free(remove); /* If there were unresolvable top-level packages, prompt the user to see if they'd like to ignore them rather than failing the sync */ if(unresolvable != NULL) { int remove_unresolvable = 0; + enum _alpm_errno_t saved_err = handle->pm_errno; QUESTION(handle, ALPM_QUESTION_REMOVE_PKGS, unresolvable, NULL, NULL, &remove_unresolvable); if(remove_unresolvable) { @@ -421,14 +431,15 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) transaction. The packages will be removed from the actual transaction when the transaction packages are replaced with a dependency-reordered list below */ - handle->pm_errno = 0; /* pm_errno was set by resolvedeps */ + handle->pm_errno = 0; if(data) { alpm_list_free_inner(*data, (alpm_list_fn_free)_alpm_depmiss_free); alpm_list_free(*data); *data = NULL; } } else { - /* pm_errno is set by resolvedeps */ + /* pm_errno was set by resolvedeps, callback may have overwrote it */ + handle->pm_errno = saved_err; alpm_list_free(resolved); ret = -1; goto cleanup; @@ -617,8 +628,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) } cleanup: - alpm_list_free(remove); - return ret; } -- 1.7.7.3

1 0