- Pacman-dev - lists.archlinux.org

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

21 Mar '07

Date: Tuesday, March 20, 2007 @ 23:08:20 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/server.c (1.26 -> 1.27) lib/libalpm/sync.c (1.111 -> 1.112) src/pacman/query.c (1.29 -> 1.30) * Fix asking the user to upgrade when using -Sp * More significant error messages when -Qo fails * Potential fix for reported error that pacman indicates corrupt packages when space is full on the cache dir ----------------------+ lib/libalpm/server.c | 27 ++++++++++++++++++++++++++- lib/libalpm/sync.c | 2 +- src/pacman/query.c | 15 +++++++++++++-- 3 files changed, 40 insertions(+), 4 deletions(-) Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.26 pacman-lib/lib/libalpm/server.c:1.27 --- pacman-lib/lib/libalpm/server.c:1.26 Mon Mar 12 19:26:47 2007 +++ pacman-lib/lib/libalpm/server.c Tue Mar 20 23:08:19 2007 @@ -29,6 +29,7 @@ #include <sys/stat.h> #include <unistd.h> #include <time.h> +#include <errno.h> #include <download.h> /* libalpm */ @@ -290,6 +291,9 @@ localf = fopen(output, "w"); if(localf == NULL) { /* still null? */ _alpm_log(PM_LOG_ERROR, _("cannot write to file '%s'"), output); + if(dlf != NULL) { + fclose(dlf); + } return -1; } } @@ -300,8 +304,29 @@ int nread = 0; char buffer[PM_DLBUF_LEN]; while((nread = fread(buffer, 1, PM_DLBUF_LEN, dlf)) > 0) { + if(ferror(dlf)) { + _alpm_log(PM_LOG_ERROR, _("error downloading '%s': %s"), + fn, downloadLastErrString); + fclose(localf); + fclose(dlf); + return(-1); + } + int nwritten = 0; - while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ; + while(nwritten < nread) { + nwritten += fwrite(buffer, 1, (nread - nwritten), localf); + if(ferror(localf)) { + _alpm_log(PM_LOG_ERROR, _("error writing to file '%s': %s"), + realfile, strerror(errno)); + fclose(localf); + fclose(dlf); + return(-1); + } + } + + if(nwritten != nread) { + + } dltotal_bytes += nread; if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.111 pacman-lib/lib/libalpm/sync.c:1.112 --- pacman-lib/lib/libalpm/sync.c:1.111 Mon Mar 19 22:36:21 2007 +++ pacman-lib/lib/libalpm/sync.c Tue Mar 20 23:08:19 2007 @@ -317,7 +317,7 @@ if(!resp) { return(0); } - } else { + } else if(!(trans->flags & PM_TRANS_FLAG_PRINTURIS)) { QUESTION(trans, PM_TRANS_CONV_LOCAL_UPTODATE, local, NULL, NULL, &resp); if(!resp) { _alpm_log(PM_LOG_WARNING, _("%s-%s is up to date -- skipping"), Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.29 pacman-lib/src/pacman/query.c:1.30 --- pacman-lib/src/pacman/query.c:1.29 Sun Mar 11 21:25:40 2007 +++ pacman-lib/src/pacman/query.c Tue Mar 20 23:08:20 2007 @@ -27,6 +27,7 @@ #include <string.h> #include <sys/stat.h> #include <libintl.h> +#include <errno.h> #include <alpm.h> #include <alpm_list.h> @@ -57,8 +58,18 @@ return; } - if(stat(filename, &buf) == -1 || S_ISDIR(buf.st_mode) || realpath(filename, rpath) == NULL) { - /* fail silently if we're a directory */ + if(stat(filename, &buf) == -1) { + ERR(NL, _("failed to read file '%s': %s"), filename, strerror(errno)); + return; + } + + if(S_ISDIR(buf.st_mode)) { + ERR(NL, _("can not determine ownership of a directory")); + return; + } + + if(realpath(filename, rpath) == NULL) { + ERR(NL, _("cannot determine real path for '%s': %s"), filename, strerror(errno)); return; }

1 0

[pacman-dev] -Se pactest
by James Rosten 20 Mar '07

20 Mar '07

Not sure if you guys want this, but I guess it can't hurt. It's a pactest for -Se, which failed with RC2 (as expected) and passed with CVS (also as expected). sync1001.py (yeah for weird number scheming that I still don't get! :P, haha) is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> --- RANDOM_ROOT_FOR_p1_USAGE/dev/null 2007-03-20 13:49:34.000000000 -0400 +++ NEW/pactest/tests/sync1001.py 2007-03-20 18:55:00.000000000 -0400 @@ -0,0 +1,18 @@ +self.description = "Test -Se" + +sp1 = pmpkg("dummy") +sp1.depends = [ "dep1", "dep2" ] +self.addpkg2db("sync", sp1) + +sp2 = pmpkg("dep1") +self.addpkg2db("sync", sp2) + +sp3 = pmpkg("dep2") +self.addpkg2db("sync", sp3) + +self.args = "-Se dummy" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=dep1") +self.addrule("PKG_EXIST=dep2") +self.addrule("!PKG_EXIST=dummy")

1 0

[pacman-dev] CVS update of pacman-lib (TODO.dan scripts/makeworld)
by Dan McGee 20 Mar '07

20 Mar '07

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(a)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

1 0

[pacman-dev] [patch] makeworld and makepkg -w
by Alessio 'mOLOk' Bolognino 20 Mar '07

20 Mar '07

This patch makes makeworld script working with the latest makepkg that doesn't have the "-w" option. It's my first patch, I hope it's in the right format. -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

2 1

[pacman-dev] CVS update of pacman-lib (NEWS doc/pacman.8)
by Dan McGee 20 Mar '07

20 Mar '07

Date: Tuesday, March 20, 2007 @ 01:47:11 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: NEWS (1.9 -> 1.10) doc/pacman.8 (1.10 -> 1.11) * NEWS: add quick line about backup files. * pacman.8: add documentation for -Se option. --------------+ NEWS | 1 + doc/pacman.8 | 4 ++++ 2 files changed, 5 insertions(+) Index: pacman-lib/NEWS diff -u pacman-lib/NEWS:1.9 pacman-lib/NEWS:1.10 --- pacman-lib/NEWS:1.9 Wed Mar 7 12:23:15 2007 +++ pacman-lib/NEWS Tue Mar 20 01:47:11 2007 @@ -10,6 +10,7 @@ - orphans search (-Qe) now shows true orphans - new -Qu option- show all packages that can be upgraded - dependency sorting on install and removal + - improved backup handling- backup array is proactive on upgrade - new uncompressed size field, shown on sync upgrade - check for free space before installing packages - improved progress and progressbar output Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.10 pacman-lib/doc/pacman.8:1.11 --- pacman-lib/doc/pacman.8:1.10 Sun Mar 18 22:45:00 2007 +++ pacman-lib/doc/pacman.8 Tue Mar 20 01:47:11 2007 @@ -188,6 +188,10 @@ \fB--clean\fP switch to remove \fIold\fP packages; use two to remove \fIall\fP packages from the cache. .TP +.B \-e, --dependsonly +Install all dependencies of a package, but not the specified package itself. +This is pretty useless and we're not sure why it even exists. +.TP .B \-g, --groups Display all the members for each package group specified. If no group names are provided, all groups will be listed; pass the flag twice to view all

1 0

[pacman-dev] is srcpac alive?
by Alessio 'mOLOk' Bolognino 20 Mar '07

20 Mar '07

I don't think srcpac is strictly speaking part of pacman, anyway, I find it useful. Actually srcpac is broken 'cause it uses "-w" makepkg's option that is no longer supported. Does anybody care about srcpac? -- Alessio 'mOLOk' Bolognino Arch Linux Trusted User http://www.archlinux.org

2 1

[pacman-dev] CVS update of pacman-lib/lib/libalpm (sync.c)
by Aaron Griffin 20 Mar '07

20 Mar '07

Date: Monday, March 19, 2007 @ 22:36:21 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: sync.c (1.110 -> 1.111) * Fix pacman -Se which installs depends only, as it was broken (Is this useful to anyone?) --------+ sync.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.110 pacman-lib/lib/libalpm/sync.c:1.111 --- pacman-lib/lib/libalpm/sync.c:1.110 Mon Mar 5 17:13:34 2007 +++ pacman-lib/lib/libalpm/sync.c Mon Mar 19 22:36:21 2007 @@ -416,11 +416,17 @@ } else { /* remove the original targets from the list if requested */ if((trans->flags & PM_TRANS_FLAG_DEPENDSONLY)) { - void *vp; - pmpkg_t *p; - trans->packages = alpm_list_remove(trans->packages, spkg, _alpm_pkg_cmp, &vp); - p = vp; - FREEPKG(p); + void *vpkg; + pmsyncpkg_t *sync; + const char *pkgname; + + pkgname = alpm_pkg_get_name(spkg); + _alpm_log(PM_LOG_DEBUG, "removing package %s-%s from the transaction targets", + pkgname, alpm_pkg_get_version(spkg)); + + sync = _alpm_sync_find(trans->packages, pkgname); + trans->packages = alpm_list_remove(trans->packages, sync, syncpkg_cmp, &vpkg); + FREESYNC(vpkg); } } }

1 0

[pacman-dev] makepkg fix
by James Rosten 20 Mar '07

20 Mar '07

If I tell makepkg to install missing deps with pacman and then tell pacman not to install, makepkg keeps going. So I made --noconfirm a default $PACMAN_OPTS. Patch is below. ~ Jamie / yankees26 Signed-off-by: James Rosten <seinfeld90(a)gmail.com> Index: scripts/makepkg =================================================================== RCS file: /home/cvs-pacman/pacman-lib/scripts/makepkg,v retrieving revision 1.60 diff -u -r1.60 makepkg --- OLD/scripts/makepkg 18 Mar 2007 23:09:50 -0000 1.60 +++ NEW/scripts/makepkg 18 Mar 2007 23:11:58 -0000 @@ -50,7 +50,7 @@ REPKG=0 LOGGING=0 -PACMAN_OPTS= +PACMAN_OPTS="--noconfirm" #determine if we are running with fakeroot if [ "$1" = "-F" ]; then @@ -376,7 +376,6 @@ echo echo "These options can be passed to pacman:" echo - echo " --noconfirm Do not ask for confirmation when resolving dependencies" echo " --noprogressbar Do not show a progress bar when downloading files" echo echo "If -p is not specified, makepkg will look for '$BUILDSCRIPT'" @@ -411,7 +410,6 @@ while [ "$#" -ne "0" ]; do case $1 in # pacman - --noconfirm) PACMAN_OPTS="$PACMAN_OPTS --noconfirm" ;; --noprogressbar) PACMAN_OPTS="$PACMAN_OPTS --noprogressbar" ;; # makepkg --clean) CLEANUP=1 ;;

2 1

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

20 Mar '07

Date: Monday, March 19, 2007 @ 22:13:44 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.62 -> 1.63) * makepkg: a few more changes to get dependencies working correctly. If a user does not install all required dependencies, makepkg will now bail. ---------+ makepkg | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.62 pacman-lib/scripts/makepkg:1.63 --- pacman-lib/scripts/makepkg:1.62 Mon Mar 19 21:34:16 2007 +++ pacman-lib/scripts/makepkg Mon Mar 19 22:13:44 2007 @@ -217,7 +217,7 @@ fi sudo pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then - error "Failed to install missing dependencies." + error "Pacman failed to install missing dependencies." exit 1 fi if [ "$INFAKEROOT" = "1" ]; then @@ -229,7 +229,7 @@ msg "Installing missing dependencies..." pacman $PACMAN_OPTS -S $striplist if [ $? -eq 1 ]; then - error "Failed to install missing dependencies." + error "Pacman failed to install missing dependencies." exit 1 fi elif [ "$DEP_SRC" = "1" ]; then @@ -290,18 +290,24 @@ } resolvedeps() { + deplist="" + newdeplist="" + deplist=$(checkdeps $*) if [ -n "${deplist}" ]; then handledeps $deplist if [ $? -eq 0 ]; then # check deps again to make sure they were resolved - newdeplist=$(checkdeps ${depends[@]}) + newdeplist=$(checkdeps $*) if [ -n "${newdeplist}" ]; then - error "Failed to install missing dependencies." + error "Failed to install all missing dependencies." fi + else + newdeplist="$deplist" fi fi + # if new dep list is not empty, print the list if [ -n "${newdeplist}" ]; then msg "Missing Dependencies:" for dep in ${newdeplist}; do @@ -315,8 +321,8 @@ # fix flyspray bug #5923 removedeps() { - # runtimedeps and makedeps are set when resolving deps - local deplist="$runtimedeps $makedeps" + # runtimedeps and buildtimedeps are set when resolving deps + local deplist="$runtimedeps $buildtimedeps" local depstrip="" local striplist="" @@ -623,21 +629,23 @@ elif [ $(type -p pacman) ]; then deperr=0 # these two variables are needed later by removedeps - unset runtimedeps makedeps + unset runtimedeps buildtimedeps msg "Checking Runtime Dependencies..." resolvedeps ${depends[@]} + ret=$? # deplist is a global variable set by resolvedeps runtimedeps="$deplist" - if [ $? -ne 0 ]; then + if [ "$ret" != "0" ]; then deperr=1 fi msg "Checking Buildtime Dependencies..." resolvedeps ${makedepends[@]} + ret=$? # deplist is a global variable set by resolvedeps - makedeps="$deplist" - if [ $? -ne 0 ]; then + buildtimedeps="$deplist" + if [ "$ret" != "0" ]; then deperr=1 fi

1 0

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

20 Mar '07

Date: Monday, March 19, 2007 @ 21:34:16 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.61 -> 1.62) * makepkg: Fix behavior of -Ssr: deps were not being correctly removed before. ---------+ makepkg | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.61 pacman-lib/scripts/makepkg:1.62 --- pacman-lib/scripts/makepkg:1.61 Mon Mar 19 18:48:54 2007 +++ pacman-lib/scripts/makepkg Mon Mar 19 21:34:16 2007 @@ -177,9 +177,6 @@ } checkdeps() { - local missdep="" - local deplist="" - [ $# -gt 0 ] || return pmout=$(pacman $PACMAN_OPTS -T $*) @@ -196,6 +193,8 @@ handledeps() { local missingdeps=0 local deplist="$*" + local depstrip="" + local striplist="" local haveperm=0 if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then haveperm=1 @@ -296,16 +295,16 @@ handledeps $deplist if [ $? -eq 0 ]; then # check deps again to make sure they were resolved - deplist=$(checkdeps ${depends[@]}) - if [ -n "${deplist}" ]; then + newdeplist=$(checkdeps ${depends[@]}) + if [ -n "${newdeplist}" ]; then error "Failed to install missing dependencies." fi fi fi - if [ -n "${deplist}" ]; then + if [ -n "${newdeplist}" ]; then msg "Missing Dependencies:" - for dep in ${deplist}; do + for dep in ${newdeplist}; do msg2 "${dep}" done return 1 @@ -316,20 +315,30 @@ # fix flyspray bug #5923 removedeps() { - if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + # runtimedeps and makedeps are set when resolving deps + local deplist="$runtimedeps $makedeps" + local depstrip="" + local striplist="" + + for dep in $deplist; do + depstrip=$(echo $dep | sed 's|=.*$||' | sed 's|>.*$||' | sed 's|<.*$||') + striplist="$striplist $depstrip" + done + + if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman $PACMAN_OPTS -Rs $makedeplist $deplist + sudo pacman $PACMAN_OPTS -Rs $striplist if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi - elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a -n "$deplist" ]; then msg "Removing installed dependencies..." - pacman $PACMAN_OPTS -Rs $makedeplist $deplist + pacman $PACMAN_OPTS -Rs $striplist fi } @@ -605,7 +614,6 @@ msg "Making package: $pkgname $pkgver-$pkgrel ($(date))" -unset deplist makedeplist # fix flyspray bug #5973 if [ "$NODEPS" = "1" -o "$GENINTEG" = "1" -o "$NOBUILD" = "1" -o "$REPKG" = "1" ]; then if [ "$NODEPS" = "1" ]; then @@ -614,15 +622,21 @@ # skip printing a warning message for the others: geninteg, nobuild, repkg elif [ $(type -p pacman) ]; then deperr=0 + # these two variables are needed later by removedeps + unset runtimedeps makedeps msg "Checking Runtime Dependencies..." resolvedeps ${depends[@]} + # deplist is a global variable set by resolvedeps + runtimedeps="$deplist" if [ $? -ne 0 ]; then deperr=1 fi msg "Checking Buildtime Dependencies..." resolvedeps ${makedepends[@]} + # deplist is a global variable set by resolvedeps + makedeps="$deplist" if [ $? -ne 0 ]; then deperr=1 fi

1 0