- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib (TODO.dan doc/PKGBUILD.5 scripts/rankmirrors)
by dan＠archlinux.org 12 Feb '07

12 Feb '07

Date: Sunday, February 11, 2007 @ 20:08:35 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.7 -> 1.8) doc/PKGBUILD.5 (1.6 -> 1.7) scripts/rankmirrors (1.4 -> 1.5) * Unified description of arch variable. Recommend using single quotes in the array, e.g. arch=('i686'). * Updated my TODO. * Changed the email address in rankmirrors script. ---------------------+ TODO.dan | 7 ++++++- doc/PKGBUILD.5 | 2 +- scripts/rankmirrors | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.7 pacman-lib/TODO.dan:1.8 --- pacman-lib/TODO.dan:1.7 Fri Feb 9 10:37:20 2007 +++ pacman-lib/TODO.dan Sun Feb 11 20:08:35 2007 @@ -62,6 +62,11 @@ needs to be in config.h and what does not. There may be excess #depends which are hard coded into the sources. (from TODO.autoconf) +Profile the code. Find the functions that are being called a lot, and see what +can be done about it. Find out if all these calls are necessary (e.g. excessive +alpm_list_count calls), and maybe think about changing data structures to speed +operations up (e.g. a 'count' field). + Other ideas: ============ @@ -69,7 +74,7 @@ Possibly split utilities/extras from pacman package -Rewrite gensync/updatesync, and add a 'repo-remove' script +Rewrite gensync/updatesync FS #4185 - move where message is logged, perhaps? Index: pacman-lib/doc/PKGBUILD.5 diff -u pacman-lib/doc/PKGBUILD.5:1.6 pacman-lib/doc/PKGBUILD.5:1.7 --- pacman-lib/doc/PKGBUILD.5:1.6 Fri Feb 9 10:37:20 2007 +++ pacman-lib/doc/PKGBUILD.5 Sun Feb 11 20:08:35 2007 @@ -100,7 +100,7 @@ .TP .B arch \fI(array)\fP Defines on which architectures the given package is available. (e.g. -\fBarch=("i686" "x86_64")\fP) +\fBarch=('i686' 'x86_64')\fP) .TP .B backup \fI(array)\fP Index: pacman-lib/scripts/rankmirrors diff -u pacman-lib/scripts/rankmirrors:1.4 pacman-lib/scripts/rankmirrors:1.5 --- pacman-lib/scripts/rankmirrors:1.4 Tue Jan 16 22:48:02 2007 +++ pacman-lib/scripts/rankmirrors Sun Feb 11 20:08:35 2007 @@ -3,7 +3,7 @@ # rankmirrors : read a list of mirrors from a file and rank them by speed # # Original Idea copyright (c) 2006 R.G. <chesercat> -# Modified 2006 by Dan McGee <dpmcgee(a)gmail.com> +# Modified 2006 by Dan McGee <dan(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

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (remove.c)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Sunday, February 11, 2007 @ 19:41:08 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: remove.c (1.61 -> 1.62) This should be an ERROR, not a WARNING ----------+ remove.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.61 pacman-lib/lib/libalpm/remove.c:1.62 --- pacman-lib/lib/libalpm/remove.c:1.61 Thu Feb 8 03:09:35 2007 +++ pacman-lib/lib/libalpm/remove.c Sun Feb 11 19:41:08 2007 @@ -183,7 +183,7 @@ if(access(file, F_OK) == 0) { /* only return failure if the file ACTUALLY exists and we don't have * permissions */ - _alpm_log(PM_LOG_WARNING, _("cannot remove file '%s': %s"), file, strerror(errno)); + _alpm_log(PM_LOG_ERROR, _("cannot remove file '%s': %s"), file, strerror(errno)); return(0); } }

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by dan＠archlinux.org 11 Feb '07

11 Feb '07

Date: Sunday, February 11, 2007 @ 16:47:37 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.47 -> 1.48) * Implemented FS #5641 as suggested in Aaron's comment- '-S' option now means '--usesudo', and all install/dep/remove operations now honor it. * Fixed my stupid typo. depricated -> deprecated :) ---------+ makepkg | 83 ++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 40 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.47 pacman-lib/scripts/makepkg:1.48 --- pacman-lib/scripts/makepkg:1.47 Fri Feb 9 14:16:15 2007 +++ pacman-lib/scripts/makepkg Sun Feb 11 16:47:37 2007 @@ -39,7 +39,7 @@ CLEANCACHE=0 DEP_BIN=0 DEP_SRC=0 -DEP_SUDO=0 +SUDO=0 FORCE=0 GENINTEG=0 INSTALL=0 @@ -120,7 +120,7 @@ elif [ "$lc" = "!$needle" ]; then echo "n" return - # START DEPRICATED + # START DEPRECATED # TODO This code should be removed in the next release of makepkg elif [ "$lc" = "no$needle" ]; then warning "Options beginning with 'no' will be depricated in the next version of makepkg!" @@ -129,7 +129,7 @@ return elif [ "$lc" = "keepdocs" -a "$needle" = "docs" ]; then warning "Option 'keepdocs' may not work as intended. Please replace with 'docs'." - # END DEPRICATED + # END DEPRECATED fi done # fall back to makepkg.conf options @@ -214,20 +214,12 @@ local missingdeps=0 local deplist="$*" local haveperm=0 - if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$DEP_SUDO" = 1 ]; then + if [ $ "$EUID" = "0" -a "$INFAKEROOT" != "1" $ -o "$SUDO" = 1 ]; then haveperm=1 fi if [ "$deplist" != "" -a $haveperm -eq 1 ]; then - if [ "$DEP_BIN" = "1" ]; then - # install missing deps from binary packages (using pacman -S) - msg "Installing missing dependencies..." - pacman $PACMAN_OPTS -D $deplist - if [ "$?" = "127" ]; then - error "Failed to install missing dependencies." - exit 1 - fi - elif [ "$DEP_SUDO" = "1" ]; then + if [ "$DEP_BIN" = "1" -a "$SUDO" = "1" ]; then # install missing deps from binary packages (using pacman -S and sudo) msg "Installing missing dependencies..." if [ "$INFAKEROOT" = "1" ]; then @@ -245,6 +237,14 @@ export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi + elif [ "$DEP_BIN" = "1" ]; then + # install missing deps from binary packages (using pacman -S) + msg "Installing missing dependencies..." + pacman $PACMAN_OPTS -D $deplist + if [ "$?" = "127" ]; then + error "Failed to install missing dependencies." + exit 1 + fi elif [ "$DEP_SRC" = "1" ]; then # install missing deps by building them from source. # we look for each package name in $SRCROOT and build it. @@ -304,11 +304,7 @@ # fix flyspray bug #5923 removedeps() { - if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then - msg "Removing installed dependencies..." - pacman $PACMAN_OPTS -Rs $makedeplist $deplist - # fixes bug #6215 - elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + if [ "$RMDEPS" = "1" -a "$SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then msg "Removing installed dependencies..." if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY2=$FAKEROOTKEY @@ -319,9 +315,32 @@ export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2 fi + elif [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then + msg "Removing installed dependencies..." + pacman $PACMAN_OPTS -Rs $makedeplist $deplist fi } +installpackage() { + if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then + msg "Installing package with pacman -U..." + if [ "$INFAKEROOT" = "1" ]; then + FAKEROOTKEY2=$FAKEROOTKEY + unset FAKEROOTKEY + fi + sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + local exitcode=$? + if [ "$INFAKEROOT" = "1" ]; then + export FAKEROOTKEY=$FAKEROOTKEY2 + unset FAKEROOTKEY2 + fi + exit $exitcode + elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then + msg "Installing package with pacman -U..." + pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + exit $? + fi +} usage() { echo "makepkg version $myver" @@ -348,7 +367,7 @@ # fix flyspray feature request #2978 echo " -R, --repackage Repackage contents of pkg/ without building" echo " -s, --syncdeps Install missing dependencies with pacman" - echo " -S, --sudosync Install missing dependencies with pacman and sudo" + echo " -S, --usesudo When calling pacman, use sudo" echo echo "These options can be passed to pacman:" echo @@ -393,7 +412,7 @@ --clean) CLEANUP=1 ;; --cleancache) CLEANCACHE=1 ;; --syncdeps) DEP_BIN=1 ;; - --sudosync) DEP_SUDO=1 ;; + --usesudo) SUDO=1 ;; --builddeps) DEP_SRC=1 ;; --noccache) USE_CCACHE="n" ;; --nodeps) NODEPS=1 ;; @@ -438,7 +457,7 @@ r) RMDEPS=1 ;; R) REPKG=1 ;; s) DEP_BIN=1 ;; - S) DEP_SUDO=1 ;; + S) SUDO=1 ;; -) OPTIND=0 break @@ -458,7 +477,7 @@ done # check for sudo -if [ "$DEP_SUDO" = "1" -a ! "$(type -p sudo)" ]; then +if [ "$SUDO" = "1" -a ! "$(type -p sudo)" ]; then error "Cannot find the sudo binary! Is sudo installed?" exit 1 fi @@ -534,8 +553,7 @@ if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} -a "$FORCE" = "0" -a "$GENINTEG" = "0" ]; then if [ "$INSTALL" = "1" ]; then warning "a package has already been built, installing existing package." - echo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} - pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} + installpackage exit $? else error "a package has already been built. (use -f to overwrite)" @@ -1010,22 +1028,7 @@ msg "Finished making: $pkgname ($(date))" -if [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then - msg "Installing package with pacman -U..." - pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} - exit $? -elif [ "$INSTALL" = "1" -a "$DEP_SUDO" = "1" ]; then - msg "Installing package with pacman -U..." - if [ "$INFAKEROOT" = "1" ]; then - FAKEROOTKEY2=$FAKEROOTKEY - unset FAKEROOTKEY - fi - sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.${PKGEXT} - if [ "$INFAKEROOT" = "1" ]; then - export FAKEROOTKEY=$FAKEROOTKEY2 - unset FAKEROOTKEY2 - fi -fi +installpackage exit 0 # vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib/scripts (Makefile.am)
by dan＠archlinux.org 11 Feb '07

11 Feb '07

Date: Sunday, February 11, 2007 @ 16:03:01 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: Makefile.am (1.3 -> 1.4) Forgot to update the Makefile with the new script, adding it. -------------+ Makefile.am | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/scripts/Makefile.am diff -u pacman-lib/scripts/Makefile.am:1.3 pacman-lib/scripts/Makefile.am:1.4 --- pacman-lib/scripts/Makefile.am:1.3 Tue Dec 19 02:39:44 2006 +++ pacman-lib/scripts/Makefile.am Sun Feb 11 16:03:00 2007 @@ -7,4 +7,5 @@ rankmirrors \ abs \ repo-add \ + repo-remove \ re-pacman

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-remove)
by dan＠archlinux.org 11 Feb '07

11 Feb '07

Date: Sunday, February 11, 2007 @ 15:40:19 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Added: repo-remove (1.1) Adding repo-remove script, allows for a package to be removed from a repo. More or less a reverse 'repo-add'. -------------+ repo-remove | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) Index: pacman-lib/scripts/repo-remove diff -u /dev/null pacman-lib/scripts/repo-remove:1.1 --- /dev/null Sun Feb 11 15:40:19 2007 +++ pacman-lib/scripts/repo-remove Sun Feb 11 15:40:19 2007 @@ -0,0 +1,136 @@ +#!/bin/bash +# +# repo-remove : remove a package entry from a given repo database file +# +# Copyright (c) 2007 Dan McGee <dan(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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. + +myver='3.0.0' + +FORCE=0 +REPO_DB_FILE="" + +DB_COMPRESSION="gz" #TODO this is gross +DB_CHECKSUMS=(md5) +TMP_DIR="" + +# print usage instructions +usage() { + echo "repo-remove $myver" + echo + echo "usage: repo-remove <path-to-db> <packagename> ..." + echo + echo "repo-remove will update a package database by removing the package name" + echo "specified on the command line from the given repo database. Multiple" + echo "packages to remove can be specified on the command line." + echo + echo "Example:" + echo " repo-remove /path/to/repo.db.tar.gz kernel26" + echo +} + +# test if a file is a repository DB +test_repo_db_file () { + if [ -f "$REPO_DB_FILE" ]; then + [ "$(tar tf "$REPO_DB_FILE" | grep -c "/desc")" -gt 0 ] || return 1 + else + true + fi +} + +# remove existing entries from the DB +db_remove_entry() +{ + cd $gstmpdir + + # remove any other package in the DB with same name + for existing in *; do + if [ "${existing%-*-*}" = "$1" ]; then + echo ":: removing existing package '$existing'" + rm -rf $existing + fi + done +} # end db_remove_entry + +# PROGRAM START + +# check for help flags +if [ "$1" = "-h" -o "$1" = "--help" ]; then + usage + exit 0 +fi + +# check for correct number of args +if [ $# -lt 2 ]; then + usage + exit 1 +fi + +# main routine +if [ $# -gt 1 ]; then + gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || (\ + echo "cannot create temp directory for database building"; \ + exit 1) + + success=0 + # parse arguements + for arg in $@; do + if [ -z "$REPO_DB_FILE" ]; then + REPO_DB_FILE="$(readlink -f $arg)" + if ! test_repo_db_file; then + echo "error: repository file '$REPO_DB_FILE' is not a proper pacman db" + exit 1 + elif [ -f "$REPO_DB_FILE" ]; then + echo ":: extracting database to a temporary location" + tar xf "$REPO_DB_FILE" -C "$gstmpdir" + fi + else + echo ":: searching for package '$arg'" + + this_dir="$(pwd)" + if db_remove_entry "$arg"; then + success=1 + else + echo "error: package matching '$arg' not found" + fi + cd $this_dir + fi + done + + # if all operations were a success, rezip database + if [ "$success" = "1" ]; then + echo ":: creating updated database file ${REPO_DB_FILE}" + cd $gstmpdir + if [ -n "$(ls)" ]; then + [ -f "${REPO_DB_FILE}.old" ] && rm "${REPO_DB_FILE}.old" + [ -f "$REPO_DB_FILE" ] && mv "$REPO_DB_FILE" "${REPO_DB_FILE}.old" + case "$DB_COMPRESSION" in + gz) tar c * | gzip -9 >$REPO_DB_FILE ;; + bz2) tar c * | bzip2 -9 >$REPO_DB_FILE ;; + *) echo "warning: no compression set" + tar c * >$REPO_DB_FILE;; + esac + fi + else + echo ":: no packages modified, nothing to do" + fi +fi + +# remove the temp directory used to unzip +[ -d "$gstmpdir" ] && rm -rf $gstmpdir + +# vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.8)
by dan＠archlinux.org 11 Feb '07

11 Feb '07

Date: Saturday, February 10, 2007 @ 19:27:45 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.8 (1.5 -> 1.6) A few more slight changes to the pacman man page ----------+ pacman.8 | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) Index: pacman-lib/doc/pacman.8 diff -u pacman-lib/doc/pacman.8:1.5 pacman-lib/doc/pacman.8:1.6 --- pacman-lib/doc/pacman.8:1.5 Thu Feb 8 22:44:54 2007 +++ pacman-lib/doc/pacman.8 Sat Feb 10 19:27:45 2007 @@ -13,18 +13,22 @@ .SH DESCRIPTION \fBpacman\fP is a \fIpackage management\fP utility that tracks installed -packages on a Linux system. It has dependency support, package groups, install -and uninstall hooks, and the ability to sync your local machine with a remote -ftp server to automatically upgrade packages. \fBpacman\fP packages are a -zipped tar format. +packages on a Linux system. It features dependency support, package groups, +install and uninstall hooks, and the ability to sync your local machine with a +remote ftp server to automatically upgrade packages. \fBpacman\fP packages are +a zipped tar format. + +Since version 3.0.0, \fBpacman\fP has been the frontend to \fBlibalpm\fP, the +"Arch Linux Package Management" library. This library allows alternative front +ends to be written (for instance, a GUI front end). .SH OPERATIONS .TP .B \-A, --add (deprecated) -Add a package to the system. Package will be uncompressed into the installation -root and the database will be updated. The package will not be installed if -another version is already installed. Please use \fB--upgrade\fP in place of -this option. +Add a package to the system. The package will be uncompressed into the +installation root and the database will be updated. The package will not be +installed if another version is already installed. Please use \fB--upgrade\fP +in place of this option. .TP .B \-F, --freshen This is like \fB--upgrade\fP except it will only upgrade packages already @@ -32,7 +36,7 @@ .TP .B \-Q, --query Query the package database. This operation allows you to view installed -packages and their files, as well as meta-info about individual packages +packages and their files, as well as meta-information about individual packages (dependencies, conflicts, install date, build date, size). This can be run against the local package database or can be used on individual .tar.gz packages. See \fBQUERY OPTIONS\fP below. @@ -45,7 +49,7 @@ .TP .B \-S, --sync Synchronize packages. Packages are installed directly from the ftp servers, -complete with all dependencies required to run the packages. For example, +including all dependencies required to run the packages. For example, \fBpacman -S qt\fP will download and install \fBqt\fP and all the packages it depends on. You can also use \fBpacman -Su\fP to upgrade all packages that are out of date. See \fBSYNC OPTIONS\fP below. @@ -76,7 +80,7 @@ used with care, ideally not at all. .TP .B \-r, --root \fIpath\fP -Specify alternative installation root (default is "/"). However, this should +Specify an alternative installation root (default is "/"). However, this should \fInot\fP be used as a way to install software into /usr/local instead of /usr, for example. This option should be used if you want to install a package on a temporary mounted partition, which is "owned" by another system. By using this @@ -104,8 +108,8 @@ longer required by any installed package. .TP .B \-g, --groups -Display all package members of a named group, or all grouped packages if -no name is specified. +Display all packages that are members of a named group. If not name is +specified, list all grouped packages. .TP .B \-i, --info Display information on a given package. The \fB-p\fP option can be used if @@ -125,7 +129,7 @@ .B \-p, --file Signifies that the package supplied on the command line is a file and not an entry in the database. The file will be decompressed and queried. This is -useful with \fB--info\fP and \fB--list\fP. +useful in combination with \fB--info\fP and \fB--list\fP. .TP .B \-s, --search \fIregexp\fP This will search each locally-installed package for names or descriptions that @@ -150,10 +154,9 @@ renamed with a .pacsave extension. .TP .B \-s, --recursive -For each target specified, remove it and all its dependencies, provided that -(A) they are not required by other packages; and (B) they were not explicitly -installed by the user. This option is analogous to a backwards \fB--sync\fP -operation. +Remove each target specified including all dependencies, provided that (A) they +are not required by other packages; and (B) they were not explicitly installed +by the user. This option is analogous to a backwards \fB--sync\fP operation. .SH SYNC OPTIONS .TP @@ -177,8 +180,8 @@ .TP .B \-p, --print-uris Print out URIs for each package that will be installed, including any -dependencies that have yet to be installed. These can be piped to a file and -downloaded at a later time, using a program like wget. +dependencies yet to be installed. These can be piped to a file and downloaded +at a later time, using a program like wget. .TP .B \-s, --search \fIregexp\fP This will search each package in the sync databases for names or descriptions

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (package.h)
by Aaron Griffin 10 Feb '07

10 Feb '07

Date: Saturday, February 10, 2007 @ 18:50:31 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: package.h (1.27 -> 1.28) -----------+ package.h | 8 ++++++++ 1 file changed, 8 insertions(+) Index: pacman-lib/lib/libalpm/package.h diff -u pacman-lib/lib/libalpm/package.h:1.27 pacman-lib/lib/libalpm/package.h:1.28 --- pacman-lib/lib/libalpm/package.h:1.27 Wed Feb 7 00:57:28 2007 +++ pacman-lib/lib/libalpm/package.h Sat Feb 10 18:50:31 2007 @@ -84,6 +84,14 @@ /* internal */ pmpkgfrom_t origin; void *data; + /* TODO replace 'data' with this: + origin == PKG_FROM_CACHE, use pkg->origin_data.db + origin == PKG_FROM_FILE, use pkg->origin_data.fd + union { + int fd; + pmdb_t *db; + } origin_data; + */ pmdbinfrq_t infolevel; };

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c package.c)
by Aaron Griffin 10 Feb '07

10 Feb '07

Date: Saturday, February 10, 2007 @ 18:44:40 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.112 -> 1.113) package.c (1.65 -> 1.66) * Package file parsing - fixed size and isize - isize is the "size" variable from the PKGINFO, and size is the stat() size of the archive * Removed the useless 'output' param from package.c:parse_descfile * Installation progress - Call progress callback once at 0% for initialization - 'needdisp' was useless - alpm_list_count is called an excessive amount in these nested loops. Now we only call it once per iteration - Use the compressed sizes for PROGRESS calcs as uncompressed (isize) is not exact (it is missing metadata sizes), and thus produces > 100% numbers -----------+ add.c | 41 +++++++++++++++++++++++------------------ package.c | 26 +++++++++++++------------- 2 files changed, 36 insertions(+), 31 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.112 pacman-lib/lib/libalpm/add.c:1.113 --- pacman-lib/lib/libalpm/add.c:1.112 Sat Feb 10 04:36:36 2007 +++ pacman-lib/lib/libalpm/add.c Sat Feb 10 18:44:39 2007 @@ -351,8 +351,7 @@ int _alpm_add_commit(pmtrans_t *trans, pmdb_t *db) { - int i, ret = 0, errors = 0, needdisp = 0; - double percent = 0.0; + int i, ret = 0, errors = 0, pkg_count = 0; register struct archive *archive; struct archive_entry *entry; char expath[PATH_MAX], cwd[PATH_MAX] = "", *what; @@ -369,7 +368,11 @@ return(0); } + pkg_count = alpm_list_count(trans->targets); + for(targ = trans->packages; targ; targ = targ->next) { + int targ_count = 0; + double percent = 0.0; unsigned short pmo_upgrade; char pm_install[PATH_MAX]; pmpkg_t *info = (pmpkg_t *)targ->data; @@ -468,13 +471,14 @@ _alpm_log(PM_LOG_DEBUG, _("extracting files")); /* Extract the package */ - if ((archive = archive_read_new ()) == NULL) + if ((archive = archive_read_new()) == NULL) { RET_ERR(PM_ERR_LIBARCHIVE_ERROR, -1); + } - archive_read_support_compression_all (archive); - archive_read_support_format_all (archive); + archive_read_support_compression_all(archive); + archive_read_support_format_all(archive); - if (archive_read_open_file (archive, info->data, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { + if(archive_read_open_file(archive, info->data, ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) { RET_ERR(PM_ERR_PKG_OPEN, -1); } @@ -488,6 +492,10 @@ /* libarchive requires this for extracting hard links */ chdir(handle->root); + targ_count = alpm_list_count(targ); + /* call PROGRESS once with 0 percent, as we sort-of skip that here */ + PROGRESS(trans, cb_state, what, 0, pkg_count, (pkg_count - targ_count +1)); + for(i = 0; archive_read_next_header (archive, &entry) == ARCHIVE_OK; i++) { int nb = 0; int notouch = 0; @@ -498,21 +506,19 @@ STRNCPY(pathname, archive_entry_pathname(entry), PATH_MAX); - if (info->size != 0) { - /* There's a problem here. These sizes don't match up. info->size is - * the COMPRESSED size, and info->isize is uncompressed. It appears, - * however, that these are the only two sizes available. It appears - * to be close enough, BUT easilly goes over 100%, so we'll stall - * there for now */ - percent = (double)archive_position_uncompressed(archive) / info->size; + if(info->size != 0) { + /* Using compressed size for calculations here, as info->isize is not + * exact when it comes to comparing to the ACTUAL uncompressed size + * (missing metadata sizes) */ + unsigned long pos = archive_position_compressed(archive); + percent = (double)pos / (double)info->size; + _alpm_log(PM_LOG_DEBUG, "decompression progress: %f%% (%ld / %ld)", percent*100.0, pos, info->size); if(percent >= 1.0) { percent = 1.0; } } - if (needdisp == 0) { - PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); - } + PROGRESS(trans, cb_state, what, (int)(percent * 100), pkg_count, (pkg_count - targ_count +1)); if(strcmp(pathname, ".PKGINFO") == 0 || strcmp(pathname, ".FILELIST") == 0) { archive_read_data_skip (archive); @@ -855,8 +861,7 @@ } } - PROGRESS(trans, cb_state, what, 100, alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); - needdisp = 0; + PROGRESS(trans, cb_state, what, 100, pkg_count, (pkg_count - targ_count +1)); EVENT(trans, PM_TRANS_EVT_EXTRACT_DONE, NULL, NULL); FREE(what); Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.65 pacman-lib/lib/libalpm/package.c:1.66 --- pacman-lib/lib/libalpm/package.c:1.65 Fri Feb 9 16:54:57 2007 +++ pacman-lib/lib/libalpm/package.c Sat Feb 10 18:44:39 2007 @@ -30,6 +30,9 @@ #include <libintl.h> #include <locale.h> #include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <unistd.h> /* pacman */ #include "package.h" #include "log.h" @@ -177,7 +180,7 @@ * Returns: 0 on success, 1 on error * */ -static int parse_descfile(char *descfile, pmpkg_t *info, int output) +static int parse_descfile(char *descfile, pmpkg_t *info) { FILE* fp = NULL; char line[PATH_MAX]; @@ -199,14 +202,11 @@ if(strlen(line) == 0 || line[0] == '#') { continue; } - if(output) { - _alpm_log(PM_LOG_DEBUG, "%s", line); - } ptr = line; key = strsep(&ptr, "="); if(key == NULL || ptr == NULL) { _alpm_log(PM_LOG_DEBUG, _("%s: syntax error in description file line %d"), - info->name[0] != '\0' ? info->name : "error", linenum); + info->name[0] != '\0' ? info->name : "error", linenum); } else { _alpm_strtrim(key); key = _alpm_strtoupper(key); @@ -245,12 +245,7 @@ } else if(!strcmp(key, "ARCH")) { STRNCPY(info->arch, ptr, sizeof(info->arch)); } else if(!strcmp(key, "SIZE")) { - char tmp[32]; - STRNCPY(tmp, ptr, sizeof(tmp)); - info->size = atol(ptr); - } else if(!strcmp(key, "ISIZE")) { - char tmp[32]; - STRNCPY(tmp, ptr, sizeof(tmp)); + /* size in the raw package is uncompressed (installed) size */ info->isize = atol(ptr); } else if(!strcmp(key, "DEPEND")) { info->depends = alpm_list_add(info->depends, strdup(ptr)); @@ -266,7 +261,7 @@ info->backup = alpm_list_add(info->backup, strdup(ptr)); } else { _alpm_log(PM_LOG_DEBUG, _("%s: syntax error in description file line %d"), - info->name[0] != '\0' ? info->name : "error", linenum); + info->name[0] != '\0' ? info->name : "error", linenum); } } line[0] = '\0'; @@ -290,6 +285,7 @@ char *descfile = NULL; int fd = -1; alpm_list_t *all_files = NULL; + struct stat st; ALPM_LOG_FUNC; @@ -314,6 +310,10 @@ RET_ERR(PM_ERR_MEMORY, NULL); } + if(stat(pkgfile, &st) == 0) { + info->size = st.st_size; + } + /* TODO there is no reason to make temp files to read * from a libarchive archive, it can be done by reading * directly from the archive @@ -333,7 +333,7 @@ fd = mkstemp(descfile); archive_read_data_into_fd (archive, fd); /* parse the info file */ - if(parse_descfile(descfile, info, 0) == -1) { + if(parse_descfile(descfile, info) == -1) { _alpm_log(PM_LOG_ERROR, _("could not parse the package description file")); goto pkg_invalid; }

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (4 files)
by Aaron Griffin 10 Feb '07

10 Feb '07

Date: Saturday, February 10, 2007 @ 04:34:59 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: Makefile.am (1.13 -> 1.14) downloadprog.c (1.13 -> 1.14) log.c (1.28 -> 1.29) util.c (1.28 -> 1.29) Cleaned up some more output * Questions no longer start with "error:" * downloaded size is output as a float now ----------------+ Makefile.am | 8 ++++---- downloadprog.c | 20 +++++++++++--------- log.c | 2 +- util.c | 4 +++- 4 files changed, 19 insertions(+), 15 deletions(-) Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.13 pacman-lib/src/pacman/Makefile.am:1.14 --- pacman-lib/src/pacman/Makefile.am:1.13 Mon Jan 29 17:18:32 2007 +++ pacman-lib/src/pacman/Makefile.am Sat Feb 10 04:34:59 2007 @@ -16,10 +16,10 @@ pacman_static_SOURCES = $(pacman_SOURCES) -pacman_LDADD = -L$(top_builddir)/lib/libalpm/.libs \ - -ldownload -lalpm +pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so \ + -ldownload -pacman_static_LDADD = -L$(top_builddir)/lib/libalpm/.libs/ \ - -ldownload -lalpm +pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ + -ldownload pacman_static_LDFLAGS = $(LDFLAGS) -all-static Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.13 pacman-lib/src/pacman/downloadprog.c:1.14 --- pacman-lib/src/pacman/downloadprog.c:1.13 Thu Feb 8 15:44:47 2007 +++ pacman-lib/src/pacman/downloadprog.c Sat Feb 10 04:34:59 2007 @@ -53,7 +53,7 @@ const int infolen = 50; char *fname, *p; - float rate = 0.0, timediff = 0.0; + float rate = 0.0, timediff = 0.0, f_xfered = 0.0; unsigned int eta_h = 0, eta_m = 0, eta_s = 0; int percent; char rate_size = 'K', xfered_size = 'K'; @@ -112,11 +112,13 @@ eta_s -= eta_m * 60; fname = strdup(filename); + /* strip extension if it's there + * NOTE: in the case of package files, only the pkgname is sent now */ if((p = strstr(fname, PM_EXT_PKG)) || (p = strstr(fname, PM_EXT_DB))) { *p = '\0'; } if(strlen(fname) > FILENAME_TRIM_LEN) { - fname[FILENAME_TRIM_LEN] = '\0'; + strcpy(fname + FILENAME_TRIM_LEN -3,"..."); } /* Awesome formatting for progress bar. We need a mess of Kb->Mb->Gb stuff @@ -132,13 +134,13 @@ } } - xfered /= 1024; /* convert to K by default */ + f_xfered = (float) xfered / 1024.0; /* convert to K by default */ /* xfered_size = 'K'; was set above */ - if(xfered > 2048) { - xfered /= 1024; + if(f_xfered > 2048.0) { + f_xfered /= 1024.0; xfered_size = 'M'; - if(xfered > 2048) { - xfered /= 1024; + if(f_xfered > 2048.0) { + f_xfered /= 1024.0; xfered_size = 'G'; /* I should seriously hope that archlinux packages never break * the 9999.9GB mark... we'd have more serious problems than the progress @@ -146,8 +148,8 @@ } } - printf(" %-*s %6d%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, - xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); + printf(" %-*s %6.1f%c %#6.1f%c/s %02u:%02u:%02u", FILENAME_TRIM_LEN, fname, + f_xfered, xfered_size, rate, rate_size, eta_h, eta_m, eta_s); free(fname); Index: pacman-lib/src/pacman/log.c diff -u pacman-lib/src/pacman/log.c:1.28 pacman-lib/src/pacman/log.c:1.29 --- pacman-lib/src/pacman/log.c:1.28 Fri Feb 9 11:02:01 2007 +++ pacman-lib/src/pacman/log.c Sat Feb 10 04:34:59 2007 @@ -175,7 +175,7 @@ va_end(args); /* Use stderr so questions are always displayed when redirecting output */ - ERR(NL, str); + pm_fprintf(stderr, NL, str); \ if(fgets(response, 32, stdin)) { /* trim whitespace and newlines */ Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.28 pacman-lib/src/pacman/util.c:1.29 --- pacman-lib/src/pacman/util.c:1.28 Thu Feb 8 15:44:48 2007 +++ pacman-lib/src/pacman/util.c Sat Feb 10 04:34:59 2007 @@ -418,10 +418,12 @@ printf("-"); } } - printf("] %3d%%\r", percent); + printf("] %3d%%", percent); if(percent == 100) { printf("\n"); + } else { + printf("\r"); } fflush(stdout); }

2 1

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c alpm.c server.c)
by Aaron Griffin 10 Feb '07

10 Feb '07

Date: Saturday, February 10, 2007 @ 04:36:36 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.111 -> 1.112) alpm.c (1.115 -> 1.116) server.c (1.20 -> 1.21) * 'add' percentages now cap at 100% (see the comment) * downloaded packages now pass ONLY the package name to the callback ----------+ add.c | 16 +++++++++++++--- alpm.c | 9 +++++---- server.c | 15 +++++++++++++-- 3 files changed, 31 insertions(+), 9 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.111 pacman-lib/lib/libalpm/add.c:1.112 --- pacman-lib/lib/libalpm/add.c:1.111 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/add.c Sat Feb 10 04:36:36 2007 @@ -496,10 +496,20 @@ char pathname[PATH_MAX]; struct stat buf; - STRNCPY(pathname, archive_entry_pathname (entry), PATH_MAX); + STRNCPY(pathname, archive_entry_pathname(entry), PATH_MAX); - if (info->size != 0) - percent = (double)archive_position_uncompressed(archive) / info->size; + if (info->size != 0) { + /* There's a problem here. These sizes don't match up. info->size is + * the COMPRESSED size, and info->isize is uncompressed. It appears, + * however, that these are the only two sizes available. It appears + * to be close enough, BUT easilly goes over 100%, so we'll stall + * there for now */ + percent = (double)archive_position_uncompressed(archive) / info->size; + if(percent >= 1.0) { + percent = 1.0; + } + } + if (needdisp == 0) { PROGRESS(trans, cb_state, what, (int)(percent * 100), alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); } Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.115 pacman-lib/lib/libalpm/alpm.c:1.116 --- pacman-lib/lib/libalpm/alpm.c:1.115 Fri Feb 9 16:54:57 2007 +++ pacman-lib/lib/libalpm/alpm.c Sat Feb 10 04:36:36 2007 @@ -593,14 +593,15 @@ arch = _supported_archs[i]; /* whee, case insensitive compare */ - while(*arch && *cmp && tolower(*arch++) == tolower(*cmp++)) ; - if(*arch || *cmp) continue; + if(*arch || *cmp) { + continue; + } - return p; + return(p); } } - return NULL; + return(NULL); } /** @} */ Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.20 pacman-lib/lib/libalpm/server.c:1.21 --- pacman-lib/lib/libalpm/server.c:1.20 Fri Feb 9 05:10:49 2007 +++ pacman-lib/lib/libalpm/server.c Sat Feb 10 04:36:36 2007 @@ -37,6 +37,7 @@ #include "util.h" #include "handle.h" #include "log.h" +#include "package.h" pmserver_t *_alpm_server_new(const char *url) { @@ -180,12 +181,22 @@ char realfile[PATH_MAX]; char output[PATH_MAX]; char *fn = (char *)lp->data; + char pkgname[PKG_NAME_LEN]; + char *p; fileurl = url_for_file(server, fn); if(!fileurl) { return(-1); } + /* Try to get JUST the name of the package from the filename */ + p = alpm_pkg_name_hasarch(fn); /* TODO remove this later */ + _alpm_pkg_splitname(fn, pkgname, NULL, (p != NULL)); + if(!strlen(pkgname)) { + /* just use the raw filename if we can't find crap */ + STRNCPY(pkgname, fn, PKG_NAME_LEN); + } + snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); @@ -278,7 +289,7 @@ } /* Progress 0 - initialize */ - if(handle->dlcb) handle->dlcb(fn, 0, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, 0, ust.size); int nread = 0; char buffer[PM_DLBUF_LEN]; @@ -287,7 +298,7 @@ while((nwritten += fwrite(buffer, 1, (nread - nwritten), localf)) < nread) ; dltotal_bytes += nread; - if(handle->dlcb) handle->dlcb(fn, dltotal_bytes, ust.size); + if(handle->dlcb) handle->dlcb(pkgname, dltotal_bytes, ust.size); } fclose(localf);

1 0