Date: Tuesday, March 20, 2007 @ 15:16:17 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.18 -> 1.19) scripts/makeworld (1.9 -> 1.10) * TODO.dan updates. Alessio 'mOLOk' Bolognino <themolok.ml@gmail.com> * Make makeworld compatable with makepkg lacking -w option. -------------------+ TODO.dan | 3 +++ scripts/makeworld | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.18 pacman-lib/TODO.dan:1.19 --- pacman-lib/TODO.dan:1.18 Mon Mar 19 00:54:58 2007 +++ pacman-lib/TODO.dan Tue Mar 20 15:16:17 2007 @@ -24,6 +24,9 @@ Downgrade feature - allow users to see cached packages and downgrade to (previous or any?) available options. +Installed size and download size in -Si/Qi output should scale with package +size- KB to MB to GB. We should also get consistancy of K/KB, M/MB, etc. + Extreme similarity between some of the sync and add code...we have to be able to abstract more away from sync actions and add actions to just 'actions' (example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*). Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.9 pacman-lib/scripts/makeworld:1.10 --- pacman-lib/scripts/makeworld:1.9 Mon Feb 12 04:37:02 2007 +++ pacman-lib/scripts/makeworld Tue Mar 20 15:16:17 2007 @@ -131,20 +131,20 @@ fi # convert a (possibly) relative path to absolute -cd $dest -dest=$(pwd) +cd "$dest" +dest="$(pwd)" cd - &>/dev/null sd=$(date +"[%b %d %H:%M]") for category in $*; do - for port in $(find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort); do + for port in $(find "$toplevel/$category" -maxdepth 1 -mindepth 1 -type d | sort); do cd $port if [ -f PKGBUILD ]; then . PKGBUILD buildstatus=0 - if [ ! -f $dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz ]; then - makepkg $MAKEPKG_OPTS -m -w $dest 2>>$toplevel/makepkg.log + if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" ]; then + PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>>$toplevel/makepkg.log if [ $? -gt 0 ]; then buildstatus=2 else