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

[pacman-dev] pacman/xdelta using XferCommand
by Dale Ogilvie 26 Mar '07

26 Mar '07

Hello, see my post on the forum (http://bbs.archlinux.org/viewtopic.php?pid=238317#p238317) Any chance that this "low-engineering" approach to implementing an xdelta solution could fly for arch, at least in the short term? This solution involves: 1. modified makepkg (see http://bbs.archlinux.org/viewtopic.php?pid=235654#p235654) 2. packagers having pkgver-1 in the makepkg build dir to create the delta 3. end-user implementing XferCommand with a custom xdelta aware script If this works well for some users, a full c-code solution in pacman could be rolled out further down the track. Thoughts? I see that archlinux.org and the mirrors have been experiencing some "bandwidth" issues after the python 2.5 release that perhaps underline the need for something like this in arch. Dale

2 1

[pacman-dev] new script: repo-local-cleaner
by Alessio 'mOLOk' Bolognino 26 Mar '07

26 Mar '07

Hi list, this is a script I wrote for myself, but Roman suggested me to send it here, so... here it is: it's a script that removes old packages in the local repo and optionally runs gensync at the end. I tried to follow the standards of makepkg, feel free to ignore it, change it, change its name and things like that. You can even change the copyright line and put Judd's name if you want. ---------------8<----------------8<-----------------8<-------------8< #!/bin/bash # repo-local-cleaner : delete old packages in local repo # # Copyright (c) 2007 Alessio 'mOLOk' Bolognino <themolok(a)gmail.com> # # 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, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. myver='3.0.0' source /etc/makepkg.conf # for $CARCH and $USE_COLOR # default settings: PKGEXT="pkg.tar.gz" LOCAL_REPO_DIR="/home/custompkgs" LOCAL_SRCROOT="/var/abs/local" LOCAL_REPO_NAME="custom" RUN_GENSYNC="n" if [ -r /etc/repo-local-cleaner.conf ]; then source /etc/repo-local-cleaner.conf fi msg() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;32m==>\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> $1" >&2 fi } error() { if [ ! "$USE_COLOR" = "n" ]; then echo -e "\033[1;31m==> ERROR:\033[1;0m \033[1;1m$1\033[1;0m" >&2 else echo "==> ERROR: $1" >&2 fi } usage() { echo "repo-local-clener $myver" echo echo "usage: repo-local-cleaner" echo echo "repo-local-clener will delete old packages from the local repository." echo "If setted in the configuration file, it can run gensync." echo "It takes no options." echo } if [ $# -ne 0 -o "$1" = "-h" -o "$1" = "--help" ]; then usage exit 0 fi cd $LOCAL_REPO_DIR count_rm=0 count_all=0 mkdir -p XXX/ for pack in $(ls -v *-${CARCH}.${PKGEXT}) ; do pkgname=${pack%-*-*-${CARCH}.${PKGEXT}} if [ "$p_pkgname" = "$pkgname" ]; then mv ${p_pack} XXX/${p_pack} let count_rm++ fi let count_all++ p_pack=${pack} p_pkgname=${pkgname} done size_removed=$(ls -sh1 XXX/ | awk '{ print $2 }' | head -1) msg "Checking for old packages..." if [ $count_rm = 0 ]; then msg "No package removed" else msg "Removed $count_rm/$count_all old package(s) ( - ${size_removed} )" fi rm -fr XXX/ if [ ! "$RUN_GENSYNC" = "n" ]; then msg "Running gensync..." gensync $LOCAL_SRCROOT $LOCAL_REPO_DIR/$LOCAL_REPO_NAME.db.tar.gz $LOCAL_REPO_DIR/ if [ $? = 0 ]; then msg "done!" else error "gensync failed :(" fi fi # vim: set ts=2 sw=2 noet: ---------------8<----------------8<-----------------8<-------------8< Cheers, -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

2 2

[pacman-dev] question
by fancris3 26 Mar '07

26 Mar '07

Pacman from today cvs. pacman -Suv Root : / DBPath : var/lib/pacman/ CacheDir : var/cache/pacman/pkg/ Targets : None :: Starting full system upgrade... warning: rar-3.7.b1-1: ignoring package upgrade (to be replaced by unrar-3.7.3-1) warning: bmpx: local (0.36.1-1) is newer than extra (0.34.7-1) warning: krusader: local (1.80.0-beta1) is newer than extra (1.70.1-1) warning: pacman: local (3.0.0-1) is newer than current (2.9.8-4) warning: pinot: local (0.65-1) is newer than community (0.49-1) warning: xapian-core: local (0.9.9-1) is newer than community (0.9.6-1) warning: xaralx: local (0.7r1766-2) is newer than unstable (0.7r1764-2) resolving dependencies... done. error: failed to prepare transaction (could not satisfy dependencies) :: opera-devel requires qt :: arts requires qt :: kdelibs requires qt>=3.3.7 I think missing the answer.Something like: :: failed to upgrade qt-enhanced-3.3.8-3 to qt-enhanced-3.3.8-4 I have qt-enhanced and kde from arch repository and now qt-enhanced-3.3.8-4 seem to no provide qt. Thanks

3 5

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 25 Mar '07

25 Mar '07

Date: Sunday, March 25, 2007 @ 13:37:43 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.d/.cvsignore (1.1 -> 1.2) pactest/tests/scriptlet001.py (1.1 -> 1.2) scripts/makepkg (1.64 -> 1.65) * Fix bug where 'makepkg -L' doesn't stop on build failure. Andrew Fyfe <andrew(a)neptune-one.net> * Add testing to etc/pacman.d/.cvsignore * Fix scriptlet001.py test to work during 'make check'. -------------------------------+ etc/pacman.d/.cvsignore | 1 + pactest/tests/scriptlet001.py | 3 ++- scripts/makepkg | 21 ++++++++------------- 3 files changed, 11 insertions(+), 14 deletions(-) Index: pacman-lib/etc/pacman.d/.cvsignore diff -u pacman-lib/etc/pacman.d/.cvsignore:1.1 pacman-lib/etc/pacman.d/.cvsignore:1.2 --- pacman-lib/etc/pacman.d/.cvsignore:1.1 Tue Jan 16 22:40:09 2007 +++ pacman-lib/etc/pacman.d/.cvsignore Sun Mar 25 13:37:42 2007 @@ -6,3 +6,4 @@ mirrorlist release unstable +testing Index: pacman-lib/pactest/tests/scriptlet001.py diff -u pacman-lib/pactest/tests/scriptlet001.py:1.1 pacman-lib/pactest/tests/scriptlet001.py:1.2 --- pacman-lib/pactest/tests/scriptlet001.py:1.1 Thu Mar 22 04:30:18 2007 +++ pacman-lib/pactest/tests/scriptlet001.py Sun Mar 25 13:37:43 2007 @@ -8,7 +8,8 @@ p1.install['post_install'] = "ls /etc"; self.addpkg(p1) -self.args = "-U %s" % p1.filename() +# --debug is necessary to check PACMAN_OUTPUT +self.args = "--debug -U %s" % p1.filename() self.addrule("PACMAN_RETCODE=0") self.addrule("PACMAN_OUTPUT=pre_install") Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.64 pacman-lib/scripts/makepkg:1.65 --- pacman-lib/scripts/makepkg:1.64 Sat Mar 24 13:11:18 2007 +++ pacman-lib/scripts/makepkg Sun Mar 25 13:37:43 2007 @@ -883,6 +883,7 @@ echo $SHELLOPTS | grep errexit 2>&1 >/dev/null set_e=$? + ret=0 if [ "$LOGGING" = "1" ]; then BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" if [ -f "$BUILDLOG" ]; then @@ -899,24 +900,18 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - - if [ ${PIPESTATUS[0]} -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi else #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 + build 2>&1 || ret=$? [ $set_e -eq 1 ] && set +e - if [ $? -gt 0 ]; then - error "Build Failed. Aborting..." - removedeps - exit 2 - fi + fi + if [ $ret -gt 0 ]; then + error "Build Failed. Aborting..." + removedeps + exit 2 fi fi

1 0

[pacman-dev] [patch] makepkg3 -- makepkg doesn't stop on build failure.
by Andrew Fyfe 25 Mar '07

25 Mar '07

Hi Found a small bug. When running 'makepkg --log' makepkg doesn't stop if build() fails. Patch attached, see the header for an example. Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: bug_log_pipe timestamp: Sun 2007-03-25 16:39:45 +0100 message: * Fix bug where 'makepkg -L' doesn't stop on build failure. To test... PKGBUILD>> pkgname=test-package pkgver=1 pkgrel=1 arch=(i686) build() { false; } run makepkg -L build() will fail and makepkg carries on trying to create the package. === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-25 15:39:45 +0000 @@ -899,10 +899,10 @@ #use 'errexit' to bail on syntax error [ $set_e -eq 1 ] && set -e - build 2>&1 | tee "$BUILDLOG" + build 2>&1 | tee "$BUILDLOG"; ret=${PIPESTATUS[0]} [ $set_e -eq 1 ] && set +e - if [ ${PIPESTATUS[0]} -gt 0 ]; then + if [ $ret -gt 0 ]; then error "Build Failed. Aborting..." removedeps exit 2

2 4

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 24 Mar '07

24 Mar '07

Date: Saturday, March 24, 2007 @ 13:11:19 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.63 -> 1.64) Andrew Fyfe <andrew(a)neptune-one.net> * Fix FS #6688- builddeps not working in makepkg. ---------+ makepkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.63 pacman-lib/scripts/makepkg:1.64 --- pacman-lib/scripts/makepkg:1.63 Mon Mar 19 22:13:44 2007 +++ pacman-lib/scripts/makepkg Sat Mar 24 13:11:18 2007 @@ -252,9 +252,9 @@ if [ -f "$pkgdir/$BUILDSCRIPT" ]; then cd "$pkgdir" if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b -r else - makepkg -i -c -b -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b fi if [ $? -eq 0 ]; then success=1

1 0

[pacman-dev] [patch] FS#6688 -- --builddeps doens't work with makepkg3
by Andrew Fyfe 24 Mar '07

24 Mar '07

Here's a patch for flyspray bug #6688. * fix flyspray bug #6688 -- --builddeps doesn't work with makepkg3 makepkg no longer supports the '-w' option, instead PKGDEST should be passed in as an enviroment variable. (ie PKGDEST=$PKGDEST pacman...) Andrew ------------------------------------------------------------ revno: 3 committer: Andrew Fyfe <andrew(a)neptune-one.net> branch nick: bug_6688 timestamp: Sat 2007-03-24 07:18:12 +0000 message: * fix flyspray bug #6688 -- --builddeps doesn't work with makepkg3 makepkg no longer supports the '-w' option, instead PKGDEST should be passed in as an enviroment variable. (ie PKGDEST=$PKGDEST pacman...) === modified file 'scripts/makepkg' --- old/scripts/makepkg 2007-03-24 03:49:27 +0000 +++ new/scripts/makepkg 2007-03-24 07:18:07 +0000 @@ -252,9 +252,9 @@ if [ -f "$pkgdir/$BUILDSCRIPT" ]; then cd "$pkgdir" if [ "$RMDEPS" = "1" ]; then - makepkg -i -c -b -r -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b -r else - makepkg -i -c -b -w $PKGDEST + PKGDEST="$PKGDEST" makepkg -i -c -b fi if [ $? -eq 0 ]; then success=1

1 0

[pacman-dev] CVS update of pacman-lib (19 files)
by Aaron Griffin 24 Mar '07

24 Mar '07

Date: Saturday, March 24, 2007 @ 00:18:19 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.18 -> 1.19) etc/pacman.conf.in (1.6 -> 1.7) etc/pacman.d/Makefile.am (1.7 -> 1.8) lib/libalpm/po/de.po (1.16 -> 1.17) lib/libalpm/po/en_GB.po (1.4 -> 1.5) lib/libalpm/po/fr.po (1.10 -> 1.11) lib/libalpm/po/hu.po (1.11 -> 1.12) lib/libalpm/po/it.po (1.20 -> 1.21) lib/libalpm/po/libalpm.pot (1.9 -> 1.10) lib/libalpm/po/pt_BR.po (1.10 -> 1.11) lib/libalpm/po/ru_RU.po (1.2 -> 1.3) src/pacman/po/de.po (1.19 -> 1.20) src/pacman/po/en_GB.po (1.6 -> 1.7) src/pacman/po/fr.po (1.14 -> 1.15) src/pacman/po/hu.po (1.15 -> 1.16) src/pacman/po/it.po (1.21 -> 1.22) src/pacman/po/pacman.pot (1.11 -> 1.12) src/pacman/po/pt_BR.po (1.14 -> 1.15) src/pacman/po/ru_RU.po (1.5 -> 1.6) * Added a mirror list for [testing] (it appears most mirrors mirror testing) * Commented ftp.archlinux.org in the official mirror list * ran a make dist, which updated some translation files ----------------------------+ Makefile.am | 4 etc/pacman.conf.in | 2 etc/pacman.d/Makefile.am | 2 lib/libalpm/po/de.po | 2 lib/libalpm/po/en_GB.po | 2 lib/libalpm/po/fr.po | 2 lib/libalpm/po/hu.po | 2 lib/libalpm/po/it.po | 2 lib/libalpm/po/libalpm.pot | 234 +++++++++++++++++++++---------------------- lib/libalpm/po/pt_BR.po | 2 lib/libalpm/po/ru_RU.po | 2 src/pacman/po/de.po | 48 +++++--- src/pacman/po/en_GB.po | 2 src/pacman/po/fr.po | 2 src/pacman/po/hu.po | 2 src/pacman/po/it.po | 2 src/pacman/po/pacman.pot | 206 +++++++++++++++++++------------------ src/pacman/po/pt_BR.po | 2 src/pacman/po/ru_RU.po | 2 19 files changed, 274 insertions(+), 248 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (mirrorlist.in)
by Dan McGee 23 Mar '07

23 Mar '07

Date: Friday, March 23, 2007 @ 13:48:05 Author: dan Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Modified: mirrorlist.in (1.5 -> 1.6) * Removed three dead mirrors (Dale Blount <dale(a)archlinux.org>). ---------------+ mirrorlist.in | 5 ----- 1 file changed, 5 deletions(-) Index: pacman-lib/etc/pacman.d/mirrorlist.in diff -u pacman-lib/etc/pacman.d/mirrorlist.in:1.5 pacman-lib/etc/pacman.d/mirrorlist.in:1.6 --- pacman-lib/etc/pacman.d/mirrorlist.in:1.5 Sun Mar 18 21:28:31 2007 +++ pacman-lib/etc/pacman.d/mirrorlist.in Fri Mar 23 13:48:05 2007 @@ -65,8 +65,3 @@ # Australia Server = ftp://mirror.pacific.net.au/linux/archlinux/@@REPO@@/os/@CARCH@ -# Asia -# - China -Server = http://mirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@ -Server = http://dxmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@ -Server = http://cncmirror.vxmatrix.net/ArchLinux/@@REPO@@/os/@CARCH@

1 0

[pacman-dev] Update for German translation
by Pierre Schmitz 23 Mar '07

23 Mar '07

Hi, i didn`t noticed that there are some new messages which have to be translated. So here is a patch; I hope not too late for the first testing-release of pacman3. Pierre

2 1