- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/scripts (gensync updatesync)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 01:07:11 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: gensync (1.12 -> 1.13) updatesync (1.8 -> 1.9) Rewrote updatesync in terms of repo-add and repo-remove ------------+ gensync | 2 updatesync | 208 ++++++++++++----------------------------------------------- 2 files changed, 45 insertions(+), 165 deletions(-) Index: pacman-lib/scripts/gensync diff -u pacman-lib/scripts/gensync:1.12 pacman-lib/scripts/gensync:1.13 --- pacman-lib/scripts/gensync:1.12 Mon Feb 12 00:49:45 2007 +++ pacman-lib/scripts/gensync Mon Feb 12 01:07:11 2007 @@ -119,7 +119,7 @@ fi done -echo "successfuly found all packages, creating repo DB..." +echo "creating repo DB..." # we'll trim the output just a tad, as gensync may be used on large repos repo-add $destfile $pkgs --force $force_pkgs \ Index: pacman-lib/scripts/updatesync diff -u pacman-lib/scripts/updatesync:1.8 pacman-lib/scripts/updatesync:1.9 --- pacman-lib/scripts/updatesync:1.8 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/updatesync Mon Feb 12 01:07:11 2007 @@ -21,7 +21,7 @@ # USA. # -myver='2.9.8' +myver='3.0.0' usage() { echo "updatesync $myver" @@ -47,128 +47,29 @@ exit 0 } -die() -{ - echo "updatesync: $*" >&2 - rm -rf $ustmpdir - exit 1 -} +BUILDSCRIPT="PKGBUILD" +PKGEXT="pkg.tar.gz" -check_option() { - local i - for i in ${options[@]}; do - local uc=`echo $i | tr [:lower:] [:upper:]` - local lc=`echo $i | tr [:upper:] [:lower:]` - if [ "$uc" = "$1" -o "$lc" = "$1" ]; then - echo $1 - return - fi - done -} +source /etc/makepkg.conf -get_md5checksum() -{ - if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - fi - if [ -f $pkgfile ]; then - md5line=`md5sum $pkgfile` - [ ! -z "$md5line" ] && pkgmd5sum=${md5line% *} - echo $pkgmd5sum - fi - return 0 +error () { + echo "==> ERROR: $*" >&2 } -db_write_entry() -{ - unset pkgname pkgver pkgrel pkgdesc force - unset groups replaces provides depends conflicts options - source $1 || return 1 - cd $ustmpdir - mkdir $pkgname-$pkgver-$pkgrel || return 1 - cd $pkgname-$pkgver-$pkgrel - # desc - : >desc - echo "%NAME%" >>desc - echo "$pkgname" >>desc - echo "" >>desc - echo "%VERSION%" >>desc - echo "$pkgver-$pkgrel" >>desc - echo "" >>desc - if [ -n "$pkgdesc" ]; then - echo "%DESC%" >>$entry - echo "$pkgdesc" >>$entry - echo "" >>$entry - fi - if [ ${#groups[*]} -gt 0 ]; then - echo "%GROUPS%" >>$entry - for it in "${groups[@]}"; do - echo "$it" >>$entry - done - echo "" >>$entry - fi - if [ -n $csize ]; then - echo "%CSIZE%" >>$entry - echo "$csize" >>$entry - echo "" >>$entry - fi - if [ ! -z $pkgmd5sum ]; then - echo "%MD5SUM%" >>$entry - echo "$pkgmd5sum" >>$entry - echo "" >>$entry - fi - if [ ${#replaces[*]} -gt 0 ]; then - echo "%REPLACES%" >>desc - for it in "${replaces[@]}"; do - echo "$it" >>desc - done - echo "" >>desc - fi - if [ "$force" = "y" -o "$force" = "Y" -o "`check_option FORCE`" ]; then - echo "%FORCE%" >>desc - echo "" >>desc - fi - # depends - : >depends - if [ ${#depends[*]} -gt 0 ]; then - echo "%DEPENDS%" >>depends - for it in "${depends[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#conflicts[*]} -gt 0 ]; then - echo "%CONFLICTS%" >>depends - for it in "${conflicts[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#provides[*]} -gt 0 ]; then - echo "%PROVIDES%" >>depends - for it in "${provides[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi +die () { + error $* + exit 1 } -delete_entry() -{ - echo $1 | grep PKGBUILD 2>&1 >/dev/null - if [ $? -eq 0 ]; then - source $1 - else - pkgname=$1 - fi - for i in *; do - if [ "${i%-*-*}" = "$pkgname" ]; then - echo "updatesync: deleting $i" >&2 - rm -rf $i +check_force () { + local i + for i in ${options[@]}; do + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "force" ]; then + true fi done + false } if [ $# -lt 3 ]; then @@ -181,71 +82,50 @@ exit 0 fi +if [ "$1" != "upd" -a "$1" != "del" ]; then + usage + exit 1 +fi + action=$1 pkgdb=$2 option=$3 -curdir="`pwd`" -pkgdir=$curdir +pkgdir="$(pwd)" if [ "$4" != "" ]; then - pkgdir=$4 + pkgdir="$4" fi +opt_force="" -if [ "$action" != "upd" -a "$action" != "del" ]; then - usage - exit 1 +if [ ! -f "$option" ]; then + die "$option not found" fi -ustmpdir=$(mktemp -d /tmp/updatesync.XXXXXXXXXX) || exit 1 +if [ "$action" = "upd" ]; then # INSERT / UPDATE + unset pkgname pkgver pkgrel options -cd $ustmpdir -if [ ! -f $pkgdb ]; then - if [ ! -f $curdir/$pkgdb ]; then - echo "updatesync: $pkgdb not found" - exit 1 - fi - pkgdb=$curdir/$pkgdb -fi + source $option || die "failed to parse $option" + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" -if [ "$action" = "upd" -a ! -f $option ]; then - if [ ! -f $curdir/$option ]; then - echo "updatesync: $option not found" - exit 1 + if [ ! -f "$pkgfile" ]; then + die "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - aborting" fi - option=$curdir/$option -fi -echo "updatesync: uncompressing to $ustmpdir..." >&2 -tar -xzf $pkgdb || die "error uncompressing $pkgdb" -if [ "$action" = "upd" ]; then - # INSERT / UPDATE - delete_entry $option - - source $option || die "errors parsing $option" - if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" - else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel.pkg.tar.gz" + if check_force; then + opt_force="--force" fi - if [ -f $pkgfile ]; then - csize=`du -b $pkgfile | cut -f1` - pkgmd5sum=`get_md5checksum $pkgfile` - [ -z $pkgmd5sum ] && die "error generating checksum for $pkgfile" - echo "updatesync: creating entry for $option" >&2 - db_write_entry $option || die "error writing entry for $option" + + repo-add "$pkgdb" $opt_force "$pkgfile" +else # DELETE + fname="$(basename $option)" + if [ "$fname" = "PKGBUILD" ]; then + unset pkgname pkgver pkgrel options + source $option else - echo "updatesync: missing package: $pkgfile" >&2 + pkgname=$1 fi -else - # DELETE - delete_entry $option -fi -echo "updatesync: compressing to $pkgdb..." >&2 -cd $ustmpdir -tar c * | gzip -9 >$pkgdb || die "error writing to $pkgdb" - -cd $curdir -rm -rf $ustmpdir + repo-remove "$pkgdb" "$pkgname" +fi exit 0 # vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib/scripts (gensync)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 00:49:45 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: gensync (1.11 -> 1.12) better error message ---------+ gensync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/scripts/gensync diff -u pacman-lib/scripts/gensync:1.11 pacman-lib/scripts/gensync:1.12 --- pacman-lib/scripts/gensync:1.11 Mon Feb 12 00:38:03 2007 +++ pacman-lib/scripts/gensync Mon Feb 12 00:49:45 2007 @@ -109,7 +109,7 @@ fi if [ ! -f "$pkgfile" ]; then - error "$BUILDSCRIPT does not have a corresponding package" + error "could not find $pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT - skipping" else if check_force; then forcepkgs="$forcepkgs $pkgfile"

1 0

[pacman-dev] CVS update of pacman-lib/scripts (gensync)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Monday, February 12, 2007 @ 00:38:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: gensync (1.10 -> 1.11) Updated gensync to use repo-add ---------+ gensync | 203 +++++++++++++++----------------------------------------------- 1 file changed, 52 insertions(+), 151 deletions(-) Index: pacman-lib/scripts/gensync diff -u pacman-lib/scripts/gensync:1.10 pacman-lib/scripts/gensync:1.11 --- pacman-lib/scripts/gensync:1.10 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/gensync Mon Feb 12 00:38:03 2007 @@ -20,7 +20,7 @@ # USA. # -myver='2.9.8' +myver='3.0.0' usage() { echo "gensync $myver" @@ -45,143 +45,29 @@ exit 0 } +BUILDSCRIPT="PKGBUILD" +PKGEXT="pkg.tar.gz" + source /etc/makepkg.conf -die() { - echo "gensync: $*" >&2 - rm -rf $gstmpdir +error () { + echo "==> ERROR: $*" >&2 +} + +die () { + error $* exit 1 } -check_option() { +check_force () { local i for i in ${options[@]}; do - local uc=`echo $i | tr [:lower:] [:upper:]` - local lc=`echo $i | tr [:upper:] [:lower:]` - if [ "$uc" = "$1" -o "$lc" = "$1" ]; then - echo $1 - return + local lc=$(echo $i | tr [:upper:] [:lower:]) + if [ "$lc" = "force" ]; then + true fi done -} - -get_md5checksum() -{ - if [ -f $pkgfile ]; then - md5line=`md5sum $pkgfile` - [ ! -z "$md5line" ] && pkgmd5sum=${md5line% *} - echo $pkgmd5sum - fi - return 0 -} - -get_sha1checksum() -{ - if [ -f $pkgfile ]; then - sha1line=`sha1sum $pkgfile` - [ ! -z "$sha1line" ] && pkgsha1sum=${sha1line% *} - echo $pkgsha1sum - fi - return 0 -} - -db_write_entry() -{ - if [ "$pkgdir" != "" ]; then - pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" - else - pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" - fi - if [ ! -f $pkgfile ]; then - die "Package '$pkgfile' not found" - fi - - csize=$(du -b $pkgfile | cut -f1) - usize=$(LANG= LC_ALL= pacman -Qi -p $pkgfile 2>/dev/null|grep ^Size|sed 's/.*: $.*$/\1/') - - pkgmd5sum=`get_md5checksum $pkgfile` - [ -z $pkgmd5sum ] && die "error generating checksum for $pkgfile" - - unset pkgname pkgver pkgrel pkgdesc force - unset groups replaces provides depends conflicts options - source $1 || return 1 - cd $gstmpdir - mkdir $pkgname-$pkgver-$pkgrel || return 1 - cd $pkgname-$pkgver-$pkgrel - # desc - : >desc - echo "%NAME%" >>desc - echo "$pkgname" >>desc - echo "" >>desc - echo "%VERSION%" >>desc - echo "$pkgver-$pkgrel" >>desc - echo "" >>desc - if [ -n "$pkgdesc" ]; then - echo "%DESC%" >>desc - echo "$pkgdesc" >>desc - echo "" >>desc - fi - if [ ${#groups[*]} -gt 0 ]; then - echo "%GROUPS%" >>desc - for it in "${groups[@]}"; do - echo "$it" >>desc - done - echo "" >>desc - fi - echo "%ARCH%" >>desc - echo "$arch" >>desc - echo "" >>desc - if [ -n $csize ]; then - echo "%CSIZE%" >>desc - echo "$csize" >>desc - echo "" >>desc - fi - if [ -n $usize ]; then - echo "%USIZE%" >>desc - echo "$usize" >>desc - echo "" >>desc - fi - if [ ! -z $pkgmd5sum ]; then - echo "%MD5SUM%" >>desc - echo "$pkgmd5sum" >>desc - echo "" >>desc - fi - if [ ${#replaces[*]} -gt 0 ]; then - echo "%REPLACES%" >>desc - for it in "${replaces[@]}"; do - echo "$it" >>desc - done - echo "" >>desc - fi - if [ "$force" = "y" -o "$force" = "Y" -o "`check_option FORCE`" ]; then - echo "%FORCE%" >>desc - echo "" >>desc - fi - # depends - : >depends - if [ ${#depends[*]} -gt 0 ]; then - echo "%DEPENDS%" >>depends - for it in "${depends[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#conflicts[*]} -gt 0 ]; then - echo "%CONFLICTS%" >>depends - for it in "${conflicts[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - if [ ${#provides[*]} -gt 0 ]; then - echo "%PROVIDES%" >>depends - for it in "${provides[@]}"; do - echo "$it" >>depends - done - echo "" >>depends - fi - # preserve the modification time - touch -r $1 desc depends + false } if [ $# -lt 2 ]; then @@ -194,34 +80,49 @@ exit 0 fi -d=`dirname $1` -rootdir=`cd $d && pwd`/`basename $1` -d=`dirname $2` -destdir=`cd $d && pwd` -destfile="$destdir/`basename $2`" -pkgdir= +d=$(dirname $1) +rootdir="$(cd $d && pwd)/$(basename $1)" +d="$(dirname $2)" +destdir="$(cd $d && pwd)" +destfile="$destdir/$(basename $2)" +pkgdir="" if [ "$3" != "" ]; then - pkgdir=$3 + pkgdir="$3" fi -gstmpdir=$(mktemp -d /tmp/gensync.XXXXXXXXXX) || exit 1 -[ ! -d $rootdir ] && die "invalid root dir: $rootdir" +[ ! -d "$rootdir" ] && die "invalid root dir: $rootdir" + echo "gensync: building database entries, generating md5sums..." >&2 -cd `dirname $2` -for file in `find $rootdir/* -name PKGBUILD`; do - source $file || die "errors parsing $file" - db_write_entry $file || die "error writing entry for $file" -else - echo "gensync: missing package: $pkgfile" >&2 -fi +cd "$destdir" + +pkgs="" +forcepkgs="" + +for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do + unset pkgname pkgver pkgrel options + + source $file || die "failed to parse parse $file" + if [ "$pkgdir" != "" ]; then + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + else + pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-$CARCH.$PKGEXT" + fi + + if [ ! -f "$pkgfile" ]; then + error "$BUILDSCRIPT does not have a corresponding package" + else + if check_force; then + forcepkgs="$forcepkgs $pkgfile" + else + pkgs="$pkgs $pkgfile" + fi + fi done -echo "gensync: compressing to $destfile..." >&2 -cd $gstmpdir -tar c * | gzip -9 >$destfile -[ $? -gt 0 ] && die "error writing to $destfile" +echo "successfuly found all packages, creating repo DB..." -rm -rf $gstmpdir -exit 0 +# we'll trim the output just a tad, as gensync may be used on large repos +repo-add $destfile $pkgs --force $force_pkgs \ + | grep -e "package" -e "database" # vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib (7 files)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Sunday, February 11, 2007 @ 23:45:22 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: README (1.9 -> 1.10) lib/libalpm/alpm.c (1.116 -> 1.117) lib/libalpm/alpm.h (1.75 -> 1.76) lib/libalpm/handle.c (1.31 -> 1.32) lib/libalpm/handle.h (1.14 -> 1.15) src/pacman/query.c (1.24 -> 1.25) src/pacman/sync.c (1.108 -> 1.109) * Updated the README file * Removed the handle->needles param. It's not needed not that alpm_list_t is public ----------------------+ README | 200 +++++++++++++++++++------------------------------ lib/libalpm/alpm.c | 6 - lib/libalpm/alpm.h | 2 lib/libalpm/handle.c | 11 -- lib/libalpm/handle.h | 1 src/pacman/query.c | 5 - src/pacman/sync.c | 6 - 7 files changed, 84 insertions(+), 147 deletions(-) Index: pacman-lib/README diff -u pacman-lib/README:1.9 pacman-lib/README:1.10 --- pacman-lib/README:1.9 Thu Feb 8 00:58:11 2007 +++ pacman-lib/README Sun Feb 11 23:45:21 2007 @@ -15,7 +15,7 @@ In addition to "alpm.h", the interfaces of "alpm_list.h" have also been made available to the frontend. It is not a requirement for the frontend to use these list functions; however, it prevents frontends from having to reimplement -possibly useful functions. +a list data structure. Several structures and functions have been renamed compared to pacman 2.9 code. This was done at first for the sake of naming scheme consistency, and then @@ -25,53 +25,68 @@ names have been prepended with "_alpm_". In a general manner, public library functions are named "alpm_<type>_<action>" -(examples: alpm_trans_commit(), alpm_lib_release(), alpm_pkg_getinfo(), ...). +(examples: alpm_trans_commit(), alpm_release(), alpm_pkg_getinfo(), ...). Internal (and thus private) functions should be named "_alpm_XXX" for instance (examples: _alpm_needbackup(), _alpm_runscriplet(), ...). Functions defined and used inside a single file should be defined as "static". -NOTE: The below descriptions may be severely outdated. Yes it needs updating, -but it may be better done by doxygen comments and generated documentation. -[HANDLE] (see handle.c) +[Initialization] -The "handle" object is the heart of the library. It is a global -structure available from almost all other objects (althought some very -low level objects should not be aware of the handle object, like chained -list, package or groups structures. - -There is only one instance, created by the frontend upon -"alpm_lib_init()" call, and destroyed upon "alpm_lib_release()" call. - -alpm_lib_init() is used to initialize library internals and to create -the handle object (handle != NULL). -Before its call, the library can't be used. -alpm_lib_release() just does the opposite (memory used by the library is -freed, and handle is set to NULL). -After its call, the library is no more available. - -The aim of the handle is to provide a central placeholder for essential -library parameters (filesystem root, pointers to database objects, -configuration parameters, ...) - -The handle also allows to register a log callback usable by the frontend -to catch all sort of notifications from the library. -The frontend can choose the level of verbosity (i.e. the mask), or can -simply choose to not use the log callback. -A friendly frontend should care at least for WARNING and ERROR -notifications. -Other notifications can safely be ignored and are mainly available for -troubleshooting purpose. +alpm_init() is used to initialize library internals and to create +a transparent handle object. Before its call, the library can't be used. -Last, but not least, the handle holds a _unique_ transaction object. +alpm_lib_release() just does the opposite (memory used by the library, and the +handle is freed). After its call, the library is no longer available. -[TRANSACTION] (see trans.c, and also alpm.c) +[Options] + +In the future, the library will not use any configuration file. It will be up +to the front end to The handle holds a +number of configuration options instead (IGNOREPKG, SYSLOG usage, +log file name, registered databases, ...). + +All of the following options have a alpm_option_get_* and alpm_option_set_* +function for getting and setting the value. The cannot be set before the +library is initialized. + +* logcb: The callback function for "log" operations. +* dlcb: The callback function for download progress. +* logmask: The logging mask for which level of output is sent to the logcb. +* root: The root directory on which pacman operates (Default: /) +* dbpath: The base path to pacman's databases (Default: var/lib/pacman) +* cachedir: The base path to pacman's download cache (Default: var/cache/pacman) +* logfile: The base path to pacman's log file (Default: var/log/pacman.log) +* usesyslog: Log to syslog instead of `logfile` for file-base logging. +* upgradedelay: The time span to wait before listing a package as an upgrade (Default: 0) +* xfercommand: The command to use for downloading instead of pacman's internal + downloading functionality. +* nopassiveftp: Do not use passive FTP commands for ftp connections. +* chomp: No way, easter eggs are secret! +* usecolor: Unimplemented, but for the future. You can assume what it means. + +The following options also have a `alpm_option_add_*` function, as the values +are list structures (NOTE: The add functions are NOT plural, as they're in +english: alpm_option_get_noupgrades -> alpm_option_add_noupgrade). + +* noupgrades: Files which will never be touched by pacman (extracted as .pacnew) +* noextracts: Files which will never be extracted at all (no .pacnew file) +* ignorepkgs: Packages to ignore when upgrading. +* holdpkgs: Packages which must be upgraded before continuing. + +The following options are read-only, having ONLY alpm_option_get_* functions: + +* localdb: A pmdb_t structure for the local (installed) database +* syncdbs: A list of pmdb_t structures to which pacman can sync from. + + +[Transactions] The transaction sturcture permits easy manipulations of several packages at a time (i.e. adding, upgrade and removal operations). -A transaction can be initiatied with a type (ADD, UPGRADE or REMOVE), +A transaction can be initiated with a type (ADD, UPGRADE or REMOVE), and some flags (NODEPS, FORCE, CASCADE, ...). Note: there can only be one type at a time: a transaction is either @@ -91,97 +106,60 @@ Then, a transaction needs to be prepared (alpm_trans_prepare()). It means that the various targets added, will be inspected and challenged -against the set of alreayd installed packages (dependency checkings, +against the set of already installed packages (dependency checkings, Last, a callback is associated with each transaction. During the transaction resolution, each time a new step is started or done (i.e -dependency or conflict checkings, package adding or removal, ...), the +dependency or conflict checking, package adding or removal, ...), the callback is called, allowing the frontend to be aware of the progress of the resolution. Can be useful to implement a progress bar. -[CONFIGURATION/OPTIONS] (see handle.c) - -The library does not use any configuration file. The handle holds a -number of configuration options instead (IGNOREPKG, SYSLOG usage, -log file name, registered databases, ...). -It is up to the frontend to set the options of the library. -Options can be manipulated using calls to -alpm_set_option()/alpm_get_option(). - -Note: the file system root is a special option which can only be defined -when calling alpm_lib_init(). It can't be modified afterwards. +[Package Cache] - -[CACHE] (see cache.c) - -Compared to pacman 2.9, there is now one cache object connected to each -database object. -There are both a package and a group cache. -The cache is loaded only on demand (i.e the cache is loaded the first -time data from it should be used). - -Note: the cache of a database is always updated by the library after +libalpm maintains two caches for each DB. One is a general package cache, the +other is a group cache (for package groups). These caches are loaded on demand, +and freed when the libary is. +It is important to note tha, as a general rule, package structures should NOT be +freed manually, as they SHOULD be part of the cache. +The cache of a database is always updated by the library after an operation changing the database content (adding and/or removal of -packages). -Beware frontends ;) +packages). Beware frontends ;) -[PACKAGE] (see package.c, and also db.c) +[Package] -The package structure is using three new fields, namely: origin, data, -infolevel. -The purpose of these fields is to know some extra info about data stored -in package structures. +The package structure maintains all information for a package. In general, +packages should never be freed from front-ends, as they should always be part of +the package cache. -For instance, where is the package coming from (i.e origin)? -Was it loaded from a file or loaded from the cache? -If it's coming from a file, then the field data holds the full path and -name of the file, and infolevel is set to the highest possible value -(all package fields are reputed to be known). -Otherwise, if the package comes from a database, data is a pointer to -the database structure hosting the package, and infolevel is set -according to the db_read() infolevel parameter (it is possible using -db_read() to only read a part of the package datas). +The 'origin' data member indicates whether the package is from a file +(i.e. -U operations) or from the package cache. In the case of a file, all data +members available are present in the structure. Packages indicated as being +from the cache have data members filled on demand. For this reason, the +alpm_pkg_get_* functions will load the data from the DB as needed. -Indeed, to reduce database access, all packages data requested by the -frontend are comming from the cache. As a consequence, the library needs -to know exactly the level of information about packages it holds, and -then decide if more data needs to be fetched from the database. -In file alpm.c, have a look at alpm_pkg_getinfo() function to get an -overview. - - -[ERRORS] (error.c) +[Errors] The library provides a global variable pm_errno. It aims at being to the library what errno is for C system calls. Almost all public library functions are returning an integer value: 0 -indicating success, whereas -1 would indicate a failure. +indicating success, -1 indicating a failure. If -1 is returned, the variable pm_errno is set to a meaningful value -(not always yet, but it should improve ;). Wise frontends should always care for these returned values. Note: the helper function alpm_strerror() can also be used to translate the error code into a more friendly sentence. -[LIST] (see list.c, and especially list wrappers in alpm.c) +[List - alpm_list_t] +The alpm_list_t structure is a doubly-linked list for use with the libalpm +routines. This type is provided publicly so that frontends are free to use it +if they have no native list type (C++, glib, python, etc all have list types). +See the proper man pages for alpm_list_t references. -It is a double chained list structure, use only for the internal needs -of the library. -A frontend should be free to use its own data structures to manipulate -packages. -For instance, consider a graphical frontend using the gtk toolkit (and -as a consequence the glib library). The frontend will make use of the -glib chained lists or trees. -As a consequence, the library only provides a simple and very small -interface to retrieve pointers to its internal data (see functions -alpm_list_first(), alpm_list_next() and alpm_list_getdata()), giving to -the frontend the responsibility to copy and store the data retrieved -from the library in its own data structures. PACMAN frontend overview & internals @@ -189,7 +167,7 @@ Here are some words about the frontend responsibilities. The library can operate only a small set of well defined operations and -dumy operations. +dummy operations. High level features are left to the frontend ;) @@ -212,7 +190,7 @@ [CONFIGURATION] (see conf.c) The frontend is using a configuration file, usually "/etc/pacman.conf". -Part of these options are only usefull for the frontend only (mainly, +Part of these options are only useful for the frontend only (mainly, the download stuffs, and some options like HOLDPKG). The rest is used to configure the library. @@ -224,28 +202,8 @@ The file pacman.c has been divided into several smaller files, namely add.c, remove.c, sync.c and query.c, to hold the big parts: pacman_add, pacman_remove, pacman_sync. -These 3 functions have been splitted too to ease the code reading. - - -[DONWLOAD] (see download.c) - -The library is not providing download facilities. As a consequence, it -is up the the frontend to retrieve packages from Arch Linux servers. -To do so, pacman is linked against an improved version of libftp -supporting both http and ftp donwloads. -As a consequence, the frontend is repsonsible for the directory -/var/cache/pacman/pkgs. -One can consider that this cache is a facility provided by pacman. - -Note: other frontends have to download packages by themselves too, -although the cache directory can be shared by several frontends. - - -[LIST] (see list.c) -Single chained list. -A minimalistic chained list implementation to store options from the -configuration file, and targets passed to pacman on the command line. +These 3 functions have been split to ease the code reading. LIMITATIONS/BEHAVIOR CHANGES COMPARED TO PACMAN 2.9 Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.116 pacman-lib/lib/libalpm/alpm.c:1.117 --- pacman-lib/lib/libalpm/alpm.c:1.116 Sat Feb 10 04:36:36 2007 +++ pacman-lib/lib/libalpm/alpm.c Sun Feb 11 23:45:21 2007 @@ -615,17 +615,15 @@ * @param db pointer to the package database to search in * @return the list of packages on success, NULL on error */ -alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db) +alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, alpm_list_t* needles) { ALPM_LOG_FUNC; /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); - ASSERT(handle->needles != NULL, return(NULL)); - ASSERT(handle->needles->data != NULL, return(NULL)); ASSERT(db != NULL, return(NULL)); - return(_alpm_db_search(db, handle->needles)); + return(_alpm_db_search(db, needles)); } /** @} */ Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.75 pacman-lib/lib/libalpm/alpm.h:1.76 --- pacman-lib/lib/libalpm/alpm.h:1.75 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/alpm.h Sun Feb 11 23:45:22 2007 @@ -179,7 +179,7 @@ pmgrp_t *alpm_db_readgrp(pmdb_t *db, char *name); alpm_list_t *alpm_db_getgrpcache(pmdb_t *db); -alpm_list_t *alpm_db_search(pmdb_t *db); +alpm_list_t *alpm_db_search(pmdb_t *db, alpm_list_t* needles); /* * Packages Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.31 pacman-lib/lib/libalpm/handle.c:1.32 --- pacman-lib/lib/libalpm/handle.c:1.31 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/handle.c Sun Feb 11 23:45:22 2007 @@ -113,7 +113,6 @@ FREELIST(handle->noextract); FREELIST(handle->ignorepkg); FREELIST(handle->holdpkg); - FREELIST(handle->needles); FREE(handle); return(0); @@ -135,7 +134,6 @@ const char *alpm_option_get_xfercommand() { return handle->xfercommand; } unsigned short alpm_option_get_nopassiveftp() { return handle->nopassiveftp; } unsigned short SYMEXPORT alpm_option_get_chomp() { return handle->chomp; } -alpm_list_t *alpm_option_get_needles() { return handle->needles; } unsigned short alpm_option_get_usecolor() { return handle->use_color; } pmdb_t *alpm_option_get_localdb() { return handle->db_local; } @@ -249,15 +247,6 @@ void alpm_option_set_chomp(unsigned short chomp) { handle->chomp = chomp; } -void SYMEXPORT alpm_option_add_needle(char *needle) -{ - handle->needles = alpm_list_add(handle->needles, strdup(needle)); -} -void alpm_option_set_needles(alpm_list_t *needles) -{ - if(handle->needles) FREELIST(handle->needles); - if(needles) handle->needles = needles; -} void alpm_option_set_usecolor(unsigned short usecolor) { handle->use_color = usecolor; Index: pacman-lib/lib/libalpm/handle.h diff -u pacman-lib/lib/libalpm/handle.h:1.14 pacman-lib/lib/libalpm/handle.h:1.15 --- pacman-lib/lib/libalpm/handle.h:1.14 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/handle.h Sun Feb 11 23:45:22 2007 @@ -62,7 +62,6 @@ char *xfercommand; /* External download command */ unsigned short nopassiveftp; /* Don't use PASV ftp connections */ unsigned short chomp; /* I Love Candy! */ - alpm_list_t *needles; /* needles for searching */ /* TODO why is this here? */ unsigned short use_color; /* enable colorful output */ } pmhandle_t; Index: pacman-lib/src/pacman/query.c diff -u pacman-lib/src/pacman/query.c:1.24 pacman-lib/src/pacman/query.c:1.25 --- pacman-lib/src/pacman/query.c:1.24 Wed Feb 7 00:25:45 2007 +++ pacman-lib/src/pacman/query.c Sun Feb 11 23:45:22 2007 @@ -87,10 +87,7 @@ int done = 0; if(config->op_q_search) { - for(i = targets; i; i = alpm_list_next(i)) { - alpm_option_add_needle(alpm_list_getdata(i)); - } - alpm_list_t *ret = alpm_db_search(db_local); + alpm_list_t *ret = alpm_db_search(db_local, targets); if(ret == NULL) { return(1); } Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.108 pacman-lib/src/pacman/sync.c:1.109 --- pacman-lib/src/pacman/sync.c:1.108 Sat Feb 3 20:36:45 2007 +++ pacman-lib/src/pacman/sync.c Sun Feb 11 23:45:22 2007 @@ -236,14 +236,10 @@ { alpm_list_t *i, *j, *ret; - for(i = targets; i; i = alpm_list_next(i)) { - alpm_option_add_needle(alpm_list_getdata(i)); - } - for(i = syncs; i; i = alpm_list_next(i)) { pmdb_t *db = (pmdb_t *)alpm_list_getdata(i); if(targets) { - ret = alpm_db_search(db); + ret = alpm_db_search(db, targets); if(ret == NULL) { continue; }

1 0

[pacman-dev] Problems with the rc9
by Douglas Soares de Andrade 12 Feb '07

12 Feb '07

Hi guys, I had the problem in the attached image when doing a system upgrade. See you -- Douglas Soares de Andrade Paradigma Internet - www.paradigma.com.br

1 0

[pacman-dev] x86-64 builds?
by Dan McGee 12 Feb '07

12 Feb '07

I know we have been making a lot of changes recently, and I don't know if anyone on the 64-bit side has built and tested pacman3 in a while. Anyone on this list using 64-bit? -Dan

5 10

[pacman-dev] CVS update of pacman-lib/src/util (Makefile.am testpkg.c)
by Aaron Griffin 12 Feb '07

12 Feb '07

Date: Sunday, February 11, 2007 @ 20:30:03 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/util Added: testpkg.c (1.1) Modified: Makefile.am (1.7 -> 1.8) Added 'testpkg' binary to test for validity of a package: testpkg <package file>, returns 0 on success, 1 on failure failure will also output error messages to stdout -------------+ Makefile.am | 6 +++- testpkg.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) Index: pacman-lib/src/util/Makefile.am diff -u pacman-lib/src/util/Makefile.am:1.7 pacman-lib/src/util/Makefile.am:1.8 --- pacman-lib/src/util/Makefile.am:1.7 Mon Jan 29 17:18:32 2007 +++ pacman-lib/src/util/Makefile.am Sun Feb 11 20:30:02 2007 @@ -1,7 +1,9 @@ -bin_PROGRAMS = vercmp +bin_PROGRAMS = vercmp testpkg AM_CFLAGS = -I$(top_srcdir)/lib/libalpm vercmp_SOURCES = vercmp.c +vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so -vercmp_LDADD = $(top_builddir)/lib/libalpm/libalpm.la +testpkg_SOURCES = testpkg.c +testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so Index: pacman-lib/src/util/testpkg.c diff -u /dev/null pacman-lib/src/util/testpkg.c:1.1 --- /dev/null Sun Feb 11 20:30:03 2007 +++ pacman-lib/src/util/testpkg.c Sun Feb 11 20:30:03 2007 @@ -0,0 +1,70 @@ +/* + * testpkg.c : Test a pacman package for validity + * + * Copyright (c) 2007 by Aaron Griffin <aaronmgriffin(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. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <libgen.h> + +#include <alpm.h> + +void output_cb(unsigned short level, char *msg) +{ + if(strlen(msg)) { + switch(level) { + case PM_LOG_ERROR: printf("error: "); break; + case PM_LOG_WARNING: printf("warning: "); break; + } + puts(msg); + } +} + +int main(int argc, char **argv) +{ + int retval = 1; /* default = false */ + pmpkg_t *pkg = NULL; + + if(argc != 2) { + fprintf(stderr, "usage: %s <package file>\n", basename(argv[0])); + return(1); + } + + if(alpm_initialize() == -1) { + fprintf(stderr, "cannot initilize alpm: %s\n", alpm_strerror(pm_errno)); + return(1); + } + + /* let us get log messages from libalpm */ + alpm_option_set_logcb(output_cb); + + if(alpm_pkg_load(argv[1], &pkg) == -1 || pkg == NULL) { + retval = 1; + } else { + alpm_pkg_free(pkg); + retval = 0; + } + + if(alpm_release() == -1) { + fprintf(stderr, "error releasing alpm: %s\n", alpm_strerror(pm_errno)); + } + + return(retval); +}

1 0

[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

[pacman-dev] CVS update of pacman-lib (Makefile.am)
by Juergen Hoetzel 10 Feb '07

10 Feb '07

Date: Saturday, February 10, 2007 @ 03:10:22 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.10 -> 1.11) * fixed dist target -------------+ Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.10 pacman-lib/Makefile.am:1.11 --- pacman-lib/Makefile.am:1.10 Wed Feb 7 17:29:21 2007 +++ pacman-lib/Makefile.am Sat Feb 10 03:10:22 2007 @@ -1,11 +1,9 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc EXTRA_DIST = \ - ChangeLog \ + NEWS \ COPYING \ - README \ - TODO \ - TODO.autoconf + README check: src/pacman cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=-1

1 0

[pacman-dev] Man pages (and a quick ML note)
by Dan McGee 10 Feb '07

10 Feb '07

Hey guys, I've been working on the manpages a lot in the past day or two, and I believe they are pretty up to date now with the changes that have been made. I'd appreciate people looking them over, giving me some (constructive) criticism, and pointing anything out that needs changing, updating, or a typo fixed, etc. If it is small, just send an email telling me what needs fixing, if large, feel free to submit a patch (but if you are unfamiliar with the man page format, then just describe the change and I'll implement it). On a side note, if the topic of a thread changes on the ML, can you guys update the subject before you reply? That way talk about bug #4744 doesn't end up in the bug #5775 thread, and makes keeping track of multiple topics a lot easier. -Dan

3 6

[pacman-dev] Fwd: FS#6378: pacman 3: output issues
by Dan McGee 09 Feb '07

09 Feb '07

> FS#6378 - pacman 3: output issues > User who did this: - Roman Kyrylych (Romashka) > > ---------- > 1) I meant that it would be nice to have output like 2,0M -> 2,3M -> > 2,7M -> 3,2M, than just 2M -> 3M That is what the int -> float change does, if you know the C language types- it allows decimal places. > 2) I don't understand what you mean by "translate from language to > language" :-/ Does "..." mean "name continues but it is too long" in all languages? Of course, gettext should be able to translate this string, but the original question still stands if there is a punctuation mark in all languages used for the same purpose the English "..." is. -Dan

2 1

Re: [pacman-dev] FS#6316: Pacman 3 release bugcatcher
by Dan McGee 09 Feb '07

09 Feb '07

> The following task has a new comment added: > > FS#6316 - Pacman 3 release bugcatcher > User who did this: - Roman Kyrylych (Romashka) > > ---------- > I added Total Download Size feature request because it can be > implemented along with other output fixes/changes. > ---------- > > More information can be found at the following URL: > http://bugs.archlinux.org/task/6316#comment14228 Roman, the problem with this is it truely is a feature request- it may not be that easy to add at this point in the development cycle. I believe when the other sizes are presented, we have done nothing yet to see if those packages are cached or not, so thus do not know the actual download size. It may have to wait for pacman 3.1. -Dan

3 2

[pacman-dev] pacman3 backup=()
by Roman Kyrylych 09 Feb '07

09 Feb '07

Please add all needed files to backup array for next RC. I often use local mirror and had to modify pacman3.conf few times. -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (gen-mirrorlist.sh)
by Juergen Hoetzel 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 17:09:28 Author: juergen Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Removed: gen-mirrorlist.sh (1.1) * gen-mirrorlist.sh not needed anymore -------------------+ gen-mirrorlist.sh | 12 ------------ 1 file changed, 12 deletions(-) Index: pacman-lib/etc/pacman.d/gen-mirrorlist.sh diff -u pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 pacman-lib/etc/pacman.d/gen-mirrorlist.sh:removed --- pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 Thu Dec 28 11:54:35 2006 +++ pacman-lib/etc/pacman.d/gen-mirrorlist.sh Fri Feb 9 17:09:28 2007 @@ -1,12 +0,0 @@ -#!/bin/bash -# gen-mirrorlist.sh -# There's absolutely no way to make autoconf do this, so instead, autoconf will -# call this script - simple enough. - - -REPOS="current extra unstable release community" - -for i in $REPOS; do - rm -f $i - cat mirrorlist | sed "s|@@REPO@@|$i|g" > $i -done

1 0

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

09 Feb '07

Date: Friday, February 9, 2007 @ 16:54:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.3 -> 1.4) doc/.cvsignore (1.1 -> 1.2) lib/libalpm/alpm.c (1.114 -> 1.115) lib/libalpm/package.c (1.64 -> 1.65) lib/libalpm/po/.cvsignore (1.2 -> 1.3) lib/libalpm/versioncmp.h (1.7 -> 1.8) src/pacman/po/.cvsignore (1.2 -> 1.3) src/util/.cvsignore (1.1 -> 1.2) * Fix compile errors/warnings. * Update .cvsignore files a bit. ---------------------------+ .cvsignore | 3 +++ doc/.cvsignore | 3 +-- lib/libalpm/alpm.c | 1 - lib/libalpm/package.c | 3 ++- lib/libalpm/po/.cvsignore | 2 -- lib/libalpm/versioncmp.h | 2 +- src/pacman/po/.cvsignore | 2 -- src/util/.cvsignore | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.3 pacman-lib/.cvsignore:1.4 --- pacman-lib/.cvsignore:1.3 Wed Jan 24 03:51:50 2007 +++ pacman-lib/.cvsignore Fri Feb 9 16:54:57 2007 @@ -16,3 +16,6 @@ ltmain.sh missing stamp-h1 + +tags +cscope.out Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.1 pacman-lib/doc/.cvsignore:1.2 --- pacman-lib/doc/.cvsignore:1.1 Mon Mar 27 12:17:35 2006 +++ pacman-lib/doc/.cvsignore Fri Feb 9 16:54:57 2007 @@ -1,4 +1,3 @@ Makefile Makefile.in -*.3 -*.8 +man3 Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.114 pacman-lib/lib/libalpm/alpm.c:1.115 --- pacman-lib/lib/libalpm/alpm.c:1.114 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/alpm.c Fri Feb 9 16:54:57 2007 @@ -1146,7 +1146,6 @@ /* now do normal upgrades */ for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { - int cmp; int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.64 pacman-lib/lib/libalpm/package.c:1.65 --- pacman-lib/lib/libalpm/package.c:1.64 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 9 16:54:57 2007 @@ -31,13 +31,14 @@ #include <locale.h> #include <errno.h> /* pacman */ +#include "package.h" #include "log.h" #include "util.h" #include "error.h" #include "alpm_list.h" -#include "package.h" #include "db.h" #include "handle.h" +#include "versioncmp.h" #include "alpm.h" pmpkg_t *_alpm_pkg_new(const char *name, const char *version) Index: pacman-lib/lib/libalpm/po/.cvsignore diff -u pacman-lib/lib/libalpm/po/.cvsignore:1.2 pacman-lib/lib/libalpm/po/.cvsignore:1.3 --- pacman-lib/lib/libalpm/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/lib/libalpm/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.7 pacman-lib/lib/libalpm/versioncmp.h:1.8 --- pacman-lib/lib/libalpm/versioncmp.h:1.7 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Fri Feb 9 16:54:57 2007 @@ -27,7 +27,7 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b); #endif Index: pacman-lib/src/pacman/po/.cvsignore diff -u pacman-lib/src/pacman/po/.cvsignore:1.2 pacman-lib/src/pacman/po/.cvsignore:1.3 --- pacman-lib/src/pacman/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/src/pacman/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/src/util/.cvsignore diff -u pacman-lib/src/util/.cvsignore:1.1 pacman-lib/src/util/.cvsignore:1.2 --- pacman-lib/src/util/.cvsignore:1.1 Mon Mar 27 12:17:36 2006 +++ pacman-lib/src/util/.cvsignore Fri Feb 9 16:54:58 2007 @@ -2,5 +2,4 @@ .libs Makefile Makefile.in -convertdb vercmp

1 0

[pacman-dev] CVS update of pacman-lib/src/util (vercmp.c)
by Aaron Griffin 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 16:08:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/util Modified: vercmp.c (1.6 -> 1.7) * I made "alpm_versioncmp" public a while back, without noticing this was already done (alpm_pkg_vercmp). I dropped this change, making versioncmp "private" again. (alpm_versioncmp -> _alpm_versioncmp, hidden symbol) * Make alpm_get_upgrades use the same version check that -Su and -S use. ----------+ vercmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/util/vercmp.c diff -u pacman-lib/src/util/vercmp.c:1.6 pacman-lib/src/util/vercmp.c:1.7 --- pacman-lib/src/util/vercmp.c:1.6 Tue Jan 30 02:47:20 2007 +++ pacman-lib/src/util/vercmp.c Fri Feb 9 16:08:12 2007 @@ -45,7 +45,7 @@ return(0); } - ret = alpm_versioncmp(s1, s2); + ret = alpm_pkg_vercmp(s1, s2); printf("%d\n", ret); return(ret); }

1 0