- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c alpm.h db.h)
by dan＠archlinux.org 31 Jan '07

31 Jan '07

Date: Tuesday, January 30, 2007 @ 21:58:12 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.107 -> 1.108) alpm.h (1.68 -> 1.69) db.h (1.23 -> 1.24) slight line spacing/indent updates --------+ add.c | 4 ++-- alpm.h | 1 - db.h | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.107 pacman-lib/lib/libalpm/add.c:1.108 --- pacman-lib/lib/libalpm/add.c:1.107 Tue Jan 30 03:14:10 2007 +++ pacman-lib/lib/libalpm/add.c Tue Jan 30 21:58:12 2007 @@ -276,8 +276,8 @@ if(lp == NULL) { break; } - } - } + } + } /* Removal code should go here, as described above. Instead of simply * removing items, perhaps throw them in another list to be removed, then * proceed as sync.c would? I'm not sure because I'm not familiar enough Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.68 pacman-lib/lib/libalpm/alpm.h:1.69 --- pacman-lib/lib/libalpm/alpm.h:1.68 Tue Jan 30 02:47:20 2007 +++ pacman-lib/lib/libalpm/alpm.h Tue Jan 30 21:58:12 2007 @@ -401,7 +401,6 @@ /* * Helpers */ - /* md5sums */ char *alpm_get_md5sum(char *name); Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.23 pacman-lib/lib/libalpm/db.h:1.24 --- pacman-lib/lib/libalpm/db.h:1.23 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/db.h Tue Jan 30 21:58:12 2007 @@ -45,6 +45,7 @@ alpm_list_t *grpcache; alpm_list_t *servers; }; + /* db.c, database general calls */ pmdb_t *_alpm_db_new(char *root, char *dbpath, char *treename); void _alpm_db_free(void *data);

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (trans.c trans.h)
by dan＠archlinux.org 31 Jan '07

31 Jan '07

Date: Tuesday, January 30, 2007 @ 20:37:41 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: trans.c (1.29 -> 1.30) trans.h (1.7 -> 1.8) * Refactored some functions to clean up variable declaration. * Reduced magic number usage by fill_progress function (new). * Some switch indent fixing. * Remove use of log10 call. ---------+ trans.c | 197 ++++++++++++++++++++++++++++++++------------------------------ trans.h | 4 - 2 files changed, 106 insertions(+), 95 deletions(-) Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.29 pacman-lib/src/pacman/trans.c:1.30 --- pacman-lib/src/pacman/trans.c:1.29 Thu Jan 25 20:34:26 2007 +++ pacman-lib/src/pacman/trans.c Tue Jan 30 20:37:41 2007 @@ -26,7 +26,6 @@ #include <sys/stat.h> #include <unistd.h> #include <dirent.h> -#include <math.h> #include <libintl.h> #include <alpm.h> @@ -42,13 +41,79 @@ static int prevpercent=0; /* for less progressbar output */ +/* refactored function from cb_trans_evt */ +static void retrieve_local(void *data1, void *data2) +{ + const unsigned int maxcols = getcols(); + char out[PATH_MAX]; + unsigned int i; + + MSG(NL, " %s [", (char*)data1); + STRNCPY(out, (char*)data2, maxcols-42); + MSG(CL, "%s", out); + for(i = strlen(out); i < maxcols-43; i++) { + MSG(CL, " "); + } + fputs(_("] 100% LOCAL "), stdout); +} + +/* refactored from cb_trans_progress */ +/* TODO with a little more work, we may be able to incorporate this + * into the download progress bar as well. */ +static void fill_progress(const int percent, const int proglen) +{ + const unsigned short chomp = alpm_option_get_chomp(); + const unsigned int hashlen = proglen - 8; + const unsigned int hash = percent * hashlen / 100; + unsigned int lasthash = 0, mouth = 0; + unsigned int i; + + printf(" ["); + for(i = hashlen; i > 1; --i) { + /* if special progress bar enabled */ + if(chomp) { + if(i > hashlen - hash) { + printf("-"); + } else if(i == hashlen - hash) { + if(lasthash == hash) { + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } + } else { + lasthash = hash; + mouth = mouth == 1 ? 0 : 1; + if(mouth) { + printf("\033[1;33mC\033[m"); + } else { + printf("\033[1;33mc\033[m"); + } + } + } else if(i%3 == 0) { + printf("\033[0;37mo\033[m"); + } else { + printf("\033[0;37m \033[m"); + } + } /* else regular progress bar */ + else if(i > hashlen - hash) { + printf("#"); + } else { + printf("-"); + } + } + printf("] %3d%%\r", percent); + + if(percent == 100) { + printf("\n"); + } +} + /* Callback to handle transaction events */ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) { char str[LOG_STR_LEN] = ""; - char out[PATH_MAX]; - int i; switch(event) { case PM_TRANS_EVT_CHECKDEPS_START: @@ -155,14 +220,7 @@ fflush(stdout); break; case PM_TRANS_EVT_RETRIEVE_LOCAL: - MSG(NL, " %s [", (char*)data1); - unsigned int maxcols = getcols(); - STRNCPY(out, (char*)data2, maxcols-42); - MSG(CL, "%s", out); - for(i = strlen(out); i < maxcols-43; i++) { - MSG(CL, " "); - } - fputs(_("] 100% LOCAL "), stdout); + retrieve_local(data1, data2); break; } } @@ -286,14 +344,12 @@ } } -void cb_trans_progress(pmtransprog_t event, char *pkgname, int percent, - int howmany, int remain) +void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent, + const int howmany, const int remain) { - static int lasthash = 0, mouth = 0; - int i, hash; - long chomp = 0; - unsigned int maxcols = getcols(); - unsigned int maxpkglen, progresslen = maxcols - 57; + /* size of line to allocate for text printing (e.g. not progressbar) */ + const int infolen = 50; + int i, digits, textlen, pkglen, proglen; char *ptr = NULL; if(config->noprogressbar) { @@ -306,103 +362,58 @@ set_output_padding(0); /* shut it off again */ } - if (!pkgname) - return; - if (percent > 100) - return; - if(percent == prevpercent) + /* if no pkgname, percent is too high or unchanged, then return */ + if (!pkgname || percent > 100 || percent == prevpercent) { return; + } prevpercent=percent; switch (event) { case PM_TRANS_PROGRESS_ADD_START: ptr = _("installing"); break; - case PM_TRANS_PROGRESS_UPGRADE_START: ptr = _("upgrading"); break; - case PM_TRANS_PROGRESS_REMOVE_START: ptr = _("removing"); break; - case PM_TRANS_PROGRESS_CONFLICTS_START: ptr = _("checking for file conflicts"); break; } - hash=percent*progresslen/100; - // if the package name is too long, then slice the ending - maxpkglen=46-strlen(ptr)-(3+2*(int)log10(howmany)); - if(strlen(pkgname)>maxpkglen) - pkgname[maxpkglen]='\0'; + /* find # of digits in package counts to scale output */ + digits = 1; + i = howmany; + while((i /= 10)) { + ++digits; + } + + /* determine room left for non-digits text [not ( 1/12) part] */ + textlen = infolen - 3 - (2 * digits); + /* room left for package name */ + pkglen = textlen - strlen(ptr) - 1; switch (event) { - case PM_TRANS_PROGRESS_ADD_START: - case PM_TRANS_PROGRESS_UPGRADE_START: - case PM_TRANS_PROGRESS_REMOVE_START: - putchar('('); - for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) - putchar(' '); - printf("%d/%d) %s %s ", remain, howmany, ptr, pkgname); - if (strlen(pkgname)<maxpkglen) - for (i=maxpkglen-strlen(pkgname)-1; i>0; i--) - putchar(' '); - break; - - case PM_TRANS_PROGRESS_CONFLICTS_START: - printf("%s (", ptr); - for(i=0;i<(int)log10(howmany)-(int)log10(remain);i++) - putchar(' '); - printf("%d/%d) ", remain, howmany); - for (i=maxpkglen; i>0; i--) - putchar(' '); - break; - } - - chomp = alpm_option_get_chomp(); - - /* hide the cursor, prevent flicker during fancy graphics - printf("\033[?25l\033[?1c["); - */ - printf("["); - for(i = progresslen; i > 0; --i) { - if(chomp) { - if(i > progresslen - hash) { - printf("-"); - } else if(i == progresslen - hash) { - if(lasthash == hash) { - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } else { - lasthash = hash; - mouth = mouth == 1 ? 0 : 1; - if(mouth) { - printf("\033[1;33mC\033[m"); - } else { - printf("\033[1;33mc\033[m"); - } - } - } else if(i%3 == 0) { - printf("\033[0;37mo\033[m"); - } else { - printf("\033[0;37m \033[m"); - } - } else if(i > progresslen - hash) { - printf("#"); - } else { - printf("-"); - } - } - printf("] %3d%%\r", percent); + case PM_TRANS_PROGRESS_ADD_START: + case PM_TRANS_PROGRESS_UPGRADE_START: + case PM_TRANS_PROGRESS_REMOVE_START: + /* TODO clean up so digits and pkglen aren't passed twice */ + printf("(%*d/%*d) %s %-*.*s", digits, remain, digits, howmany, + ptr, pkglen, pkglen, pkgname); + break; + + case PM_TRANS_PROGRESS_CONFLICTS_START: + printf("(%*d/%*d) %-*s", digits, remain, digits, howmany, + textlen, ptr); + break; - if(percent == 100) { - printf("\n"); } + + /* call refactored fill progress function */ + proglen = getcols() - infolen; + fill_progress(percent, proglen); } /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/src/pacman/trans.h diff -u pacman-lib/src/pacman/trans.h:1.7 pacman-lib/src/pacman/trans.h:1.8 --- pacman-lib/src/pacman/trans.h:1.7 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/trans.h Tue Jan 30 20:37:41 2007 @@ -29,8 +29,8 @@ void *data3, int *response); /* callback to handle display of the progress bar for transactions */ -void cb_trans_progress(pmtransprog_t event, char *pkgname, int percent, - int howmany, int remain); +void cb_trans_progress(pmtransprog_t event, char *pkgname, const int percent, + const int howmany, const int remain); #endif /* _PM_TRANS_H */

1 0

[pacman-dev] CVS update of pacman-lib/scripts (repo-add)
by dan＠archlinux.org 31 Jan '07

31 Jan '07

Date: Tuesday, January 30, 2007 @ 19:38:13 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: repo-add (1.3 -> 1.4) * Updated repo-add script to remove same package, different version when adding a package to a database. Also added commenting. :) ----------+ repo-add | 93 ++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 71 insertions(+), 22 deletions(-) Index: pacman-lib/scripts/repo-add diff -u pacman-lib/scripts/repo-add:1.3 pacman-lib/scripts/repo-add:1.4 --- pacman-lib/scripts/repo-add:1.3 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/repo-add Tue Jan 30 19:38:13 2007 @@ -1,4 +1,5 @@ #!/bin/bash +# # repo-add : add a package to a given repo database file # # Copyright (c) 2006 Aaron Griffin <aaron(a)archlinux.org> @@ -18,6 +19,8 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, # USA. +myver='3.0.0' + FORCE=0 REPO_DB_FILE="" @@ -25,12 +28,27 @@ DB_CHECKSUMS=(md5) TMP_DIR="" -if [ $# -lt 2 ]; then - echo "repo-add /path/to/repo.db.tar.gz [--force] [packages-to-add]" - exit 1 -fi - +# print usage instructions +usage() { + echo "repo-add $myver" + echo + echo "usage: repo-add <path-to-db> [--force] <package> ..." + echo + echo "repo-add will update a package database by reading a package file." + echo "Multiple packages to add can be specified on the command line." + echo + echo "The --force flag will add a 'force' entry to the sync database, which" + echo "tells pacman to skip its internal version number checking and update" + echo "the package regardless." + echo + echo "Example:" + echo " repo-add /path/to/repo.db.tar.gz pacman-3.0.0.pkg.tar.gz" + echo +} +# return calculated checksum of package +# arg1 - checksum type +# arg2 - path to package get_checksum () { case "$(echo "$1" | tr A-Z a-z)" in md5) sum=$(md5sum $2); echo ${sum% *} ;; @@ -41,6 +59,8 @@ esac } +# return PKGINFO string for checksum type +# arg1 - checksum type checksum_name () { case "$(echo "$1" | tr A-Z a-z)" in md5) echo "MD5SUM" ;; @@ -51,6 +71,7 @@ esac } +# 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 @@ -59,8 +80,11 @@ fi } +# write an entry to the pacman database +# arg1 - path to package db_write_entry() { + # blank out all variables and set pkgfile pkgfile=$(readlink -f $1) export pkgname="" pkgver="" @@ -79,9 +103,10 @@ _conflicts="" OLDIFS="$IFS" - #gross... IFS == new line - IFS=' - ' + # IFS (field seperator) is only the newline character + IFS=$(echo) + + # read info from the zipped package for i in $(tar xOf "$pkgfile" .PKGINFO | grep -v "^#" |sed 's|$\w*$\s*=\s*$.*$|\1="\2"|'); do eval "${i}" case "$i" in @@ -94,28 +119,33 @@ conflicts=*) _conflicts="$_conflicts $conflicts" ;; esac done + IFS=$OLDIFS + # get compressed size of package csize="$(du -b $pkgfile | cut -f1)" cd $gstmpdir + # ensure $pkgname and $pkgver variables were found if [ -z "$pkgname" -o -z "$pkgver" ]; then echo " error: invalid package file" return 1 fi - if [ ! -d "$pkgname-$pkgver" ]; then - [ -e "$pkgname-$pkgver" ] && rm -rf "$pkgname-$pkgver" - mkdir "$pkgname-$pkgver" - cd "$pkgname-$pkgver" - else - cd "$pkgname-$pkgver" - [ -e desc ] && rm desc - [ -e depends ] && rm depends - fi + # remove any other package in the DB with same name + for existing in *; do + if [ "${existing%-*-*}" = "$pkgname" ]; then + echo ":: removing existing package '$existing'" + rm -rf $existing + fi + done + + # create package directory + mkdir "$pkgname-$pkgver" + cd "$pkgname-$pkgver" - # desc + # create desc entry echo ":: creating 'desc' db entry" echo -e "%FILENAME%\n$1\n" >> desc echo -e "%NAME%\n$pkgname\n" >>desc @@ -131,6 +161,7 @@ [ -n $csize ] && echo -e "%CSIZE%\n$csize\n" >>desc [ -n $size ] && echo -e "%ISIZE%\n$size\n" >>desc + # compute checksums for chk in ${DB_CHECKSUMS[@]}; do name="$(checksum_name $chk)" echo ":: computing $name checksums" @@ -156,7 +187,7 @@ fi [ "$FORCE" = "1" ] && echo -e "%FORCE%\n" >>desc - # depends + # create depends entry echo ":: creating 'depends' db entry" if [ -n "$depends" ]; then echo "%DEPENDS%" >>depends @@ -176,21 +207,37 @@ # preserve the modification time touch -r "$pkgfile" desc depends -} +} # end db_write_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 [ "$arg" == "--force" -o "$arg" == "-f" ]; then FORCE=1 - elif [ "x$REPO_DB_FILE" == "x" ]; then + elif [ -z "$REPO_DB_FILE" ]; then REPO_DB_FILE="$(readlink -f $arg)" if ! test_repo_db_file; then - echo " repository db file '$REPO_DB_FILE' is not a proper pacman db" + 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" @@ -215,6 +262,7 @@ fi done + # if all operations were a success, rezip database if [ "$success" = "1" ]; then echo ":: creating updated database file ${REPO_DB_FILE}" cd $gstmpdir @@ -233,6 +281,7 @@ 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 (configure.ac)
by Juergen Hoetzel 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 15:37:59 Author: juergen Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.25 -> 1.26) * doxygen check cleanup --------------+ configure.ac | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.25 pacman-lib/configure.ac:1.26 --- pacman-lib/configure.ac:1.25 Tue Jan 30 03:17:02 2007 +++ pacman-lib/configure.ac Tue Jan 30 15:37:59 2007 @@ -195,25 +195,17 @@ fi dnl Check for doxygen support -AC_MSG_CHECKING(for support Doxygen) if test x$wantdoxygen = xyes ; then AC_CHECK_PROGS([DOXYGEN], [doxygen]) - AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) if test $DOXYGEN ; then - AC_DEFINE([HAS_DOXYGEN], [TRUE], [Enabled Doxygen Support]) - AC_MSG_RESULT(yes) DOXYSTATUS="yes, path: `which $DOXYGEN`" else - AC_DEFINE([HAS_DOXYGEN], [FALSE], [Disabled Doxygen support]) - AC_MSG_RESULT(no, doxygen missing) DOXYSTATUS="doxygen binary not found" fi else - AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) - AC_DEFINE([HAS_DOXYGEN], [FALSE], [Not specified at configure line]) - AC_MSG_RESULT(not requested by configure) DOXYSTATUS="no, disabled by configure" fi +AM_CONDITIONAL(HAS_DOXYGEN, test $DOXYGEN) dnl Check for swig binary AC_CHECK_PROGS([SWIG], [swig])

1 0

[pacman-dev] CVS update of pacman-lib/src/pacman (sync.c)
by dan＠archlinux.org 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 13:25:54 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: sync.c (1.102 -> 1.103) Fixing line spacings of download/install size messages. --------+ sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.102 pacman-lib/src/pacman/sync.c:1.103 --- pacman-lib/src/pacman/sync.c:1.102 Tue Jan 30 03:35:40 2007 +++ pacman-lib/src/pacman/sync.c Tue Jan 30 13:25:54 2007 @@ -680,7 +680,7 @@ indentprint(str, 9); MSG(NL, _("\nTotal Package Size: %.1f MB\n"), mb); if(umb > 0) { - MSG(NL, _("\nTotal Installed Size: %.1f MB\n"), umb); + MSG(NL, _("Total Installed Size: %.1f MB\n"), umb); } FREELIST(list_install); FREE(str);

1 0

[pacman-dev] function tracing
by K. Piche 30 Jan '07

30 Jan '07

I developed the following patch to print a message on function entry to trace program flow. Best part is that it's a #define so it can be undefined later to keep extra code out of the library/turned on with a --debug flag/whatever. The only odd thing I found was that the PM_* constants are in alpm.h instead of log.h so some .c's have to include 2 .h files for logging: one for the function _alpm_log (which should be public since pacman uses it) and the other for the constants. The constants should be moved to the log.h file. k

2 2

[pacman-dev] "memory clobber before allocated" -S bug
by James Rosten 30 Jan '07

30 Jan '07

This is similar to what Travis reported, but instead of happening on packages that exist it happens when pacman3 can't find the package in the db. For example: [~] james->monkeybox : sudo pacman3 -S random_junk --debug=1 [20:23:18] debug: config: new section 'options' [20:23:18] debug: config: logfile: /var/log/pacman.log [20:23:18] debug: config: noupgrade: etc/passwd [20:23:18] debug: config: noupgrade: etc/group [20:23:18] debug: config: noupgrade: etc/shadow [20:23:18] debug: config: noupgrade: etc/sudoers [20:23:18] debug: config: noupgrade: etc/fstab [20:23:18] debug: config: noupgrade: etc/raidtab [20:23:18] debug: config: noupgrade: etc/mdadm.conf [20:23:18] debug: config: noupgrade: etc/ld.so.conf [20:23:18] debug: config: noupgrade: etc/inittab [20:23:18] debug: config: noupgrade: etc/rc.conf [20:23:18] debug: config: noupgrade: etc/rc.local [20:23:18] debug: config: noupgrade: etc/modprobe.conf [20:23:18] debug: config: noupgrade: etc/modules.conf [20:23:18] debug: config: noupgrade: etc/lilo.conf [20:23:18] debug: config: noupgrade: boot/grub/menu.lst [20:23:18] debug: config: noupgrade: etc/mkinitrd.conf [20:23:18] debug: config: holdpkg: pacman [20:23:18] debug: config: holdpkg: glibc [20:23:18] debug: config: new section 'current' [20:23:18] debug: opening database 'current' [20:23:18] debug: config: including /etc/pacman3.d/current [20:23:18] debug: attempt to re-register the 'current' database, using existing [20:23:18] debug: config: new section 'current' [20:23:18] debug: attempt to re-register the 'current' database, using existing [20:23:18] debug: config: new section 'extra' [20:23:18] debug: opening database 'extra' [20:23:18] debug: config: including /etc/pacman3.d/extra [20:23:18] debug: attempt to re-register the 'extra' database, using existing [20:23:18] debug: config: new section 'extra' [20:23:18] debug: attempt to re-register the 'extra' database, using existing [20:23:18] debug: config: new section 'community' [20:23:18] debug: opening database 'community' [20:23:18] debug: config: including /etc/pacman3.d/community [20:23:18] debug: attempt to re-register the 'community' database, using existing [20:23:18] debug: config: new section 'community' [20:23:18] debug: attempt to re-register the 'community' database, using existing [20:23:18] debug: opening database 'local' [20:23:18] debug: loading package cache (infolevel=0) for repository 'current' [20:23:18] debug: loading package cache (infolevel=0) for repository 'extra' [20:23:18] debug: loading package cache (infolevel=0) for repository 'community' [20:23:18] debug: package cache reloaded (infolevel=0x2) for repository 'current' [20:23:18] debug: package cache reloaded (infolevel=0x2) for repository 'extra' [20:23:18] debug: package cache reloaded (infolevel=0x2) for repository 'community' [20:23:18] debug: returning error 31 from _alpm_sync_addtarget : could not find or read package [20:23:18] debug: loading group cache for repository 'current' [20:23:19] debug: package cache reloaded (infolevel=0x1) for repository 'current' [20:23:19] debug: loading group cache for repository 'extra' [20:23:19] debug: package cache reloaded (infolevel=0x1) for repository 'extra' [20:23:19] debug: loading group cache for repository 'community' [20:23:19] debug: package cache reloaded (infolevel=0x1) for repository 'community' error: 'random_junk': not found in sync db memory clobbered before allocated block Aborted Yet, (credit goes to Dan for finding this) doing the samething with pacman3.static works perfectly. ~ Jamie / yankees26

3 2

[pacman-dev] CVS update of pacman-lib/src/pacman (sync.c)
by Aaron Griffin 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 03:35:40 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: sync.c (1.101 -> 1.102) Well that silly memory clobber was plain old "uninitialized data" - fixed --------+ sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.101 pacman-lib/src/pacman/sync.c:1.102 --- pacman-lib/src/pacman/sync.c:1.101 Tue Jan 30 00:41:13 2007 +++ pacman-lib/src/pacman/sync.c Tue Jan 30 03:35:40 2007 @@ -405,7 +405,7 @@ { int confirm = 0; int retval = 0; - alpm_list_t *packages, *data, *i, *j, *k, *sync_dbs; + alpm_list_t *packages, *data = NULL, *i, *j, *k, *sync_dbs; sync_dbs = alpm_option_get_syncdbs(); if(sync_dbs == NULL || alpm_list_count(sync_dbs) == 0) {

1 0

[pacman-dev] CVS update of pacman-lib (TODO.aaron)
by Aaron Griffin 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 03:20:15 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.11 -> 1.12) TODO changes ------------+ TODO.aaron | 5 +++++ 1 file changed, 5 insertions(+) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.11 pacman-lib/TODO.aaron:1.12 --- pacman-lib/TODO.aaron:1.11 Tue Jan 30 03:14:10 2007 +++ pacman-lib/TODO.aaron Tue Jan 30 03:20:15 2007 @@ -2,6 +2,11 @@ * Make sure all the alpm_list_t changes are valid (especially alpm_list_free) +* The --debug flag should't need a silly mask. +* PM_LOG_FLOW1 and PM_LOG_FLOW2 seem extraneous at this point. These should both + be moved to PM_LOG_DEBUG messages, as it's going to end up being impossible to + keep track of what is "flow1" and what is "flow2" + * src/pacman: - There's quite a few single function headers which contain the pacman_* functions. We should move these to a single header (pacman.h) to clean up

1 0

[pacman-dev] CVS update of pacman-lib (configure.ac)
by Aaron Griffin 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 03:17:02 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: configure.ac (1.24 -> 1.25) Turn debug off by default --------------+ configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.24 pacman-lib/configure.ac:1.25 --- pacman-lib/configure.ac:1.24 Mon Jan 29 17:18:31 2007 +++ pacman-lib/configure.ac Tue Jan 30 03:17:02 2007 @@ -148,7 +148,7 @@ dnl Help line for debug AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Enable debugging support]), - [debug=$enableval], [debug=yes]) + [debug=$enableval], [debug=no]) dnl Help line for fakeroot AC_ARG_ENABLE(fakeroot,

1 0