- Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/pactest (.cvsignore)
by dan＠archlinux.org 21 Feb '07

21 Feb '07

Date: Wednesday, February 21, 2007 @ 13:52:08 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Modified: .cvsignore (1.1 -> 1.2) Ignore pactest-created root directory ------------+ .cvsignore | 1 + 1 file changed, 1 insertion(+) Index: pacman-lib/pactest/.cvsignore diff -u pacman-lib/pactest/.cvsignore:1.1 pacman-lib/pactest/.cvsignore:1.2 --- pacman-lib/pactest/.cvsignore:1.1 Tue Jan 16 22:40:09 2007 +++ pacman-lib/pactest/.cvsignore Wed Feb 21 13:52:07 2007 @@ -1,3 +1,4 @@ Makefile Makefile.in *.pyc +root

1 0

[pacman-dev] Project metrics
by Aaron Griffin 21 Feb '07

21 Feb '07

Xentac found a neat site that deduces project metrics from source control, so registered some for us. Here's a link to the pacman project: http://www.ohloh.net/projects/4508 It appears pacman is worth $188,000 USD. Heh.

1 0

[pacman-dev] Localization of dates
by Pierre Schmitz 21 Feb '07

21 Feb '07

Hi, is it possible to display the dates with the proper locale-settings? For example: (Tue Feb 13 12:32:08 2007 UTC) [root@athlon64 pacman-rc]# pacman3 -Qi pacman-rc Name : pacman-rc Version : 2007.02.12-1 URL : http://archlinux.org Lizenz : GPL Gruppen : Nichts Stellt bereit : Nichts Hängt ab von : libarchive libdownload Entfernt : Nichts Benötigt von : Nichts Konflikt mit : Nichts Installationsgröße : 1905 K Packer : Pierre Schmitz <pierre(a)archlinux.de> Architektur : x86_64 Erstellt am : Tue Feb 13 12:32:08 2007 UTC Bauart : Unbekannt Installiert am : Tue Feb 13 12:32:15 2007 UTC Installationsgrund : Ausdrücklich installiert Installations-Skript : Nein Beschreibung : pacman 3: Testing Build Release Candidate -- http://www.archlinux.de

3 2

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

21 Feb '07

Date: Wednesday, February 21, 2007 @ 03:34:37 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.13 -> 1.14) lib/libalpm/be_files.c (1.28 -> 1.29) lib/libalpm/cache.c (1.31 -> 1.32) lib/libalpm/db.h (1.24 -> 1.25) lib/libalpm/deps.c (1.68 -> 1.69) lib/libalpm/package.c (1.72 -> 1.73) lib/libalpm/trans.c (1.36 -> 1.37) * Fixed inconsistency of args- _alpm_db_read, _alpm_db_write. ------------------------+ TODO.dan | 2 - lib/libalpm/be_files.c | 6 ++--- lib/libalpm/cache.c | 2 - lib/libalpm/db.h | 2 - lib/libalpm/deps.c | 12 +++++------ lib/libalpm/package.c | 48 +++++++++++++++++++++++------------------------ lib/libalpm/trans.c | 4 +-- 7 files changed, 37 insertions(+), 39 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.13 pacman-lib/TODO.dan:1.14 --- pacman-lib/TODO.dan:1.13 Wed Feb 21 03:16:26 2007 +++ pacman-lib/TODO.dan Wed Feb 21 03:34:36 2007 @@ -112,8 +112,6 @@ Add localized pkgdesc variables to makepkg. -Fix inconsistency of args- _alpm_db_read, _alpm_db_write - --print-uri option to sync should not require saying yes or no to up to date Add testing scripts to pactest for issues we have been working on (especially Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.28 pacman-lib/lib/libalpm/be_files.c:1.29 --- pacman-lib/lib/libalpm/be_files.c:1.28 Wed Feb 21 01:44:14 2007 +++ pacman-lib/lib/libalpm/be_files.c Wed Feb 21 03:34:36 2007 @@ -183,7 +183,7 @@ _alpm_log(PM_LOG_ERROR, _("invalid name for dabatase entry '%s'"), ent->d_name); return(NULL); } - if(_alpm_db_read(db, inforeq, pkg) == -1) { + if(_alpm_db_read(db, pkg, inforeq) == -1) { /* TODO removed corrupt entry from the FS here */ FREEPKG(pkg); } @@ -193,7 +193,7 @@ return(pkg); } -int _alpm_db_read(pmdb_t *db, unsigned int inforeq, pmpkg_t *info) +int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; struct stat buf; @@ -471,7 +471,7 @@ return(-1); } -int _alpm_db_write(pmdb_t *db, pmpkg_t *info, unsigned int inforeq) +int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq) { FILE *fp = NULL; char path[PATH_MAX]; Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.31 pacman-lib/lib/libalpm/cache.c:1.32 --- pacman-lib/lib/libalpm/cache.c:1.31 Wed Feb 21 01:44:14 2007 +++ pacman-lib/lib/libalpm/cache.c Wed Feb 21 03:34:36 2007 @@ -124,7 +124,7 @@ for(p = db->pkgcache; p; p = p->next) { pmpkg_t *pkg = (pmpkg_t *)p->data; if(infolevel != INFRQ_NONE && !(pkg->infolevel & infolevel)) { - if(_alpm_db_read(db, infolevel, pkg) == -1) { + if(_alpm_db_read(db, pkg, infolevel) == -1) { /* TODO should we actually remove from the filesystem here as well? */ _alpm_db_remove_pkgfromcache(db, pkg); } else { Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.24 pacman-lib/lib/libalpm/db.h:1.25 --- pacman-lib/lib/libalpm/db.h:1.24 Tue Jan 30 21:58:12 2007 +++ pacman-lib/lib/libalpm/db.h Wed Feb 21 03:34:36 2007 @@ -59,7 +59,7 @@ void _alpm_db_close(pmdb_t *db); void _alpm_db_rewind(pmdb_t *db); pmpkg_t *_alpm_db_scan(pmdb_t *db, char *target, pmdbinfrq_t inforeq); -int _alpm_db_read(pmdb_t *db, pmdbinfrq_t inforeq, pmpkg_t *info); +int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq); int _alpm_db_remove(pmdb_t *db, pmpkg_t *info); int _alpm_db_getlastupdate(pmdb_t *db, char *ts); Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.68 pacman-lib/lib/libalpm/deps.c:1.69 --- pacman-lib/lib/libalpm/deps.c:1.68 Tue Feb 20 03:44:32 2007 +++ pacman-lib/lib/libalpm/deps.c Wed Feb 21 03:34:36 2007 @@ -223,7 +223,7 @@ _alpm_log(PM_LOG_DEBUG, _("cannot find package installed '%s'"), tp->name); continue; } - _alpm_db_read(db, INFRQ_DEPENDS, oldpkg); + _alpm_db_read(db, oldpkg, INFRQ_DEPENDS); for(j = oldpkg->requiredby; j; j = j->next) { pmpkg_t *p; found = 0; @@ -235,7 +235,7 @@ /* this package also in the upgrade list, so don't worry about it */ continue; } - _alpm_db_read(db, INFRQ_DEPENDS, p); + _alpm_db_read(db, p, INFRQ_DEPENDS); for(k = p->depends; k && !found; k = k->next) { /* find the dependency info in p->depends */ _alpm_splitdep(k->data, &depend); @@ -278,7 +278,7 @@ /* ensure package has depends data */ pmdb_t *pkgdb = tp->data; - _alpm_db_read(pkgdb, INFRQ_DEPENDS, tp); + _alpm_db_read(pkgdb, tp, INFRQ_DEPENDS); if(!tp->depends) { _alpm_log(PM_LOG_DEBUG, _("no dependencies for target '%s'"), tp->name); } @@ -503,7 +503,7 @@ pmpkg_t *provpkg = k->data; if(can_remove_package(db, provpkg, newtargs)) { pmpkg_t *pkg = _alpm_pkg_new(provpkg->name, provpkg->version); - _alpm_db_read(db, INFRQ_ALL, pkg); + _alpm_db_read(db, pkg, INFRQ_ALL); _alpm_log(PM_LOG_DEBUG, _("adding '%s' to the targets"), pkg->name); @@ -515,7 +515,7 @@ FREELISTPTR(provides); } else if(can_remove_package(db, dep, newtargs)) { pmpkg_t *pkg = _alpm_pkg_new(dep->name, dep->version); - _alpm_db_read(db, INFRQ_ALL, pkg); + _alpm_db_read(db, pkg, INFRQ_ALL); _alpm_log(PM_LOG_DEBUG, _("adding '%s' to the targets"), pkg->name); @@ -579,7 +579,7 @@ /* check literals */ for(j = dbs_sync; !sync && j; j = j->next) { sync = _alpm_db_get_pkgfromcache(j->data, miss->depend.name); - _alpm_db_read(j->data, INFRQ_DEPENDS, sync); + _alpm_db_read(j->data, sync, INFRQ_DEPENDS); } /* check provides */ for(j = dbs_sync; !sync && j; j = j->next) { Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.72 pacman-lib/lib/libalpm/package.c:1.73 --- pacman-lib/lib/libalpm/package.c:1.72 Sun Feb 18 17:07:11 2007 +++ pacman-lib/lib/libalpm/package.c Wed Feb 21 03:34:37 2007 @@ -137,7 +137,7 @@ if(pkg->origin == PKG_FROM_CACHE) { /* ensure we have the /desc file, which contains the 'force' option */ - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } /* compare versions and see if we need to upgrade */ @@ -598,7 +598,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->desc; } @@ -612,7 +612,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->url; } @@ -626,7 +626,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->builddate; } @@ -638,7 +638,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->buildtype; } @@ -652,7 +652,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->installdate; } @@ -666,7 +666,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->packager; } @@ -680,7 +680,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->md5sum; } @@ -694,7 +694,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->sha1sum; } @@ -708,7 +708,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->arch; } @@ -722,7 +722,7 @@ ASSERT(pkg != NULL, return(-1)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->size; } @@ -736,7 +736,7 @@ ASSERT(pkg != NULL, return(-1)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->isize; } @@ -750,7 +750,7 @@ ASSERT(pkg != NULL, return(-1)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->reason; } @@ -764,7 +764,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->license; } @@ -778,7 +778,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { - _alpm_db_read(pkg->data, INFRQ_DESC, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); } return pkg->groups; } @@ -793,7 +793,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->depends; } @@ -807,7 +807,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->removes; } @@ -821,7 +821,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->requiredby; } @@ -835,7 +835,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->conflicts; } @@ -849,7 +849,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->provides; } @@ -863,7 +863,7 @@ ASSERT(pkg != NULL, return(NULL)); if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DEPENDS)) { - _alpm_db_read(pkg->data, INFRQ_DEPENDS, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_DEPENDS); } return pkg->replaces; } @@ -878,7 +878,7 @@ if(pkg->origin == PKG_FROM_CACHE && pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_db_read(pkg->data, INFRQ_FILES, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_FILES); } return pkg->files; } @@ -893,7 +893,7 @@ if(pkg->origin == PKG_FROM_CACHE && pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_FILES)) { - _alpm_db_read(pkg->data, INFRQ_FILES, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_FILES); } return pkg->backup; } @@ -908,7 +908,7 @@ if(pkg->origin == PKG_FROM_CACHE && pkg->data == handle->db_local && !(pkg->infolevel & INFRQ_SCRIPTLET)) { - _alpm_db_read(pkg->data, INFRQ_SCRIPTLET, pkg); + _alpm_db_read(pkg->data, pkg, INFRQ_SCRIPTLET); } return pkg->scriptlet; } Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.36 pacman-lib/lib/libalpm/trans.c:1.37 --- pacman-lib/lib/libalpm/trans.c:1.36 Mon Feb 19 21:14:27 2007 +++ pacman-lib/lib/libalpm/trans.c Wed Feb 21 03:34:37 2007 @@ -294,7 +294,7 @@ found_provides = 1; /* Ensure package has the right newpkg */ - _alpm_db_read(localdb, INFRQ_DEPENDS, deppkg); + _alpm_db_read(localdb, deppkg, INFRQ_DEPENDS); _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), deppkg->name); if(trans->type == PM_TRANS_TYPE_REMOVE) { @@ -318,7 +318,7 @@ } /* Ensure package has the right newpkg */ - _alpm_db_read(localdb, INFRQ_DEPENDS, deppkg); + _alpm_db_read(localdb, deppkg, INFRQ_DEPENDS); _alpm_log(PM_LOG_DEBUG, _("updating 'requiredby' field for package '%s'"), deppkg->name); if(trans->type == PM_TRANS_TYPE_REMOVE) {

1 0

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

21 Feb '07

Date: Wednesday, February 21, 2007 @ 03:16:27 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: TODO.dan (1.12 -> 1.13) src/pacman/sync.c (1.112 -> 1.113) * Slight message change for consistancy- add a ' ' (space char) at the beginning to match the way other repos are displayed. * TODO updates. -------------------+ TODO.dan | 58 ++++++++++++++++++++++++++++++---------------------- src/pacman/sync.c | 4 ++- 2 files changed, 37 insertions(+), 25 deletions(-) Index: pacman-lib/TODO.dan diff -u pacman-lib/TODO.dan:1.12 pacman-lib/TODO.dan:1.13 --- pacman-lib/TODO.dan:1.12 Mon Feb 19 21:14:27 2007 +++ pacman-lib/TODO.dan Wed Feb 21 03:16:26 2007 @@ -4,19 +4,30 @@ This is my personal TODO list. No guarantees if it is out of date and things no longer apply. If you want to help out with any of it, send me an email. -Documentation- look into moving man page format to a more portable source -format to make translation easier to keep up-to-date (something like txt2tags, -docbook, asciidoc) This will need some research. +Only vaguely related to pacman: +------------------------------- Port the libdownload (libfetch) manpage from BSD style to Linux style, or at very least change references to BSD. + +Pacman 3.0: +----------- + +ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a +.install message about mirrors, maybe comment whole file, encourage rankmirrors +usage + + Pacman 3.1: -=========== +----------- + +Documentation- look into moving man page format to a more portable source +format to make translation easier to keep up-to-date (something like txt2tags, +docbook, asciidoc) This will need some research. -Updated cache cleaning functionality in pacman - keep installed version, choose -number to keep, etc. Good python script in the forums that we should try to -emulate, perhaps. +Update cache cleaning functionality - keep installed version, choose number to +keep, etc. Good python script in the forums that we should try to emulate. Downgrade feature - allow users to see cached packages and downgrade to (previous or any?) available options. @@ -26,7 +37,7 @@ (example: sync,c, add.c, and deptest.c all contain a switch on PM_DEP_MOD_*). Merge update, add, and sync code when possible, so we reduce duplication. -Review progress /transaction event subsystem. (from TODO) +Review progress/transaction event subsystem. (from TODO) Add Doxygen comments to every function in libalpm including private functions. Ensure functions are doing exactly their purpose and nothing more. Find @@ -68,33 +79,24 @@ Localize the date display done in --info output. Also, fix other localized issues- use non-printf when necessary, make sure all two line printed messages -(especially usage instructions) are printed using one print statement. +(especially usage instructions) are printed using one print statement. We +may need to use some wchar_t output on the progress bar as char/byte counts +differ here. Rewrite makepkg to use terminal-safe coloring/bolding. tput utility should allow us to do this. -Other ideas: -============ +Other smaller things: +--------------------- unsigned int vs. unsigned- determine a standard and stick with it -Possibly split utilities/extras from pacman package - FS #4185 - move where message is logged, perhaps? -ideas mentioned here- http://bbs.archlinux.org/viewtopic.php?id=29450- add a -.install message about mirrors, maybe comment whole file, encourage rankmirrors -usage - Update copyrights (2007) Update pacman website, and add/finish pacman coding style page -Make .indent.pro file for GNU indent (started, but didn't finish) - -Pacman 3 packaging - perhaps include pacman2.static in case something goes -terribly wrong, which I hope it won't - autogen.sh / autoclean.sh - these seem messy. Can we clean this up? Refine makepkg error codes. Each kind of failure could have its own code: @@ -114,8 +116,9 @@ --print-uri option to sync should not require saying yes or no to up to date -Resurrect test scripts, and add ones as needed. Testing by scripts > testing by -hand. +Add testing scripts to pactest for issues we have been working on (especially +files moving between packages). Also, take a look at cleaning up the output and +structure of the pactest.py program itself. Build a replacement for this, or at least standardize its use. We shouldn't always need to pass handle->root around, it is constant. Something like char* @@ -123,3 +126,10 @@ /* build the new entryname relative to handle->root */ snprintf(filename, PATH_MAX, "%s%s", handle->root, entryname); +Random ideas: +------------- + +Possibly split utilities/extras from pacman package + +Make .indent.pro file for GNU indent (started, but didn't finish) + Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.112 pacman-lib/src/pacman/sync.c:1.113 --- pacman-lib/src/pacman/sync.c:1.112 Thu Feb 15 21:21:13 2007 +++ pacman-lib/src/pacman/sync.c Wed Feb 21 03:16:26 2007 @@ -39,6 +39,8 @@ #include <alpm.h> #include <alpm_list.h> #include <download.h> /* downloadLastErrString */ +/* TODO remove above download.h inclusion once we abstract more, and also + * remove it from Makefile.am on the pacman side */ /* pacman */ #include "util.h" #include "log.h" @@ -660,7 +662,7 @@ packages = alpm_trans_get_packages(); if(packages == NULL) { /* nothing to do: just exit without complaining */ - MSG(NL, _("local database is up to date\n")); + MSG(NL, _(" local database is up to date\n")); goto cleanup; }

1 0

[pacman-dev] CVS update of pacman-lib/pactest (pmenv.py)
by dan＠archlinux.org 21 Feb '07

21 Feb '07

Date: Wednesday, February 21, 2007 @ 02:13:16 Author: dan Path: /home/cvs-pacman/pacman-lib/pactest Modified: pmenv.py (1.2 -> 1.3) Fixed up the output a bit. ----------+ pmenv.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.2 pacman-lib/pactest/pmenv.py:1.3 --- pacman-lib/pactest/pmenv.py:1.2 Wed Feb 21 01:33:13 2007 +++ pacman-lib/pactest/pmenv.py Wed Feb 21 02:13:16 2007 @@ -100,16 +100,19 @@ passed += 1 else: print "[FAILED]", - print test.name.strip(".py").ljust(38), + print test.name.strip(".py").ljust(33), print "Rules:", - print " OK = %2u FAIL = %2u SKIP = %2u" % (success, fail, rules-(success+fail)) + print "OK = %2u FAIL = %2u SKIP = %2u" % \ + (success, fail, rules - (success + fail)) print "----------"*8 total = len(self.testcases) failed = total - passed print "TOTAL = %3u" % total if total: - print "PASSED = %3u (%6.2f%%)" % (passed, float(passed)*100/total) - print "FAILED = %3u (%6.2f%%)" % (failed, float(failed)*100/total) + print "PASSED = %3u (%6.2f%%)" % \ + (passed, float(passed) * 100 / total) + print "FAILED = %3u (%6.2f%%)" % \ + (failed, float(failed) * 100 / total) print

1 0

[pacman-dev] CVS update of pacman-lib (Makefile.am TODO.aaron)
by Aaron Griffin 21 Feb '07

21 Feb '07

Date: Wednesday, February 21, 2007 @ 02:12:34 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.12 -> 1.13) TODO.aaron (1.17 -> 1.18) TODO updates -------------+ Makefile.am | 2 +- TODO.aaron | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.12 pacman-lib/Makefile.am:1.13 --- pacman-lib/Makefile.am:1.12 Tue Feb 20 02:43:39 2007 +++ pacman-lib/Makefile.am Wed Feb 21 02:12:34 2007 @@ -6,4 +6,4 @@ README check: src/pacman - cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman.static --debug=1 + cd pactest; python pactest.py --test=tests/*.py -p ../src/pacman/pacman --debug=1 Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.17 pacman-lib/TODO.aaron:1.18 --- pacman-lib/TODO.aaron:1.17 Tue Feb 13 23:58:37 2007 +++ pacman-lib/TODO.aaron Wed Feb 21 02:12:34 2007 @@ -3,6 +3,16 @@ * Dan and I both have personal TODOs. Perhaps we should kill off TODO and TODO.autoconf +* transaction object should contain two package list (install and remove) + instead of a single list of syncpkgs - this should allow us to get rid of that + type. This also requires seperate functionality to return a list of + "replaces" packages to the front end, so the frontend can handle the QUESTION() + stuff in that case + +* _alpm_splitdep accepts a pre-allocated argument, instead of returning the + actual object like all the other function do... we should make the scheme the + same: pmdepend_t *_alpm_splitdep(const char *depstring); + * Look into other VCSs to use. The main CVS repo will remain, but having a distributed system to allow for easy patching/pushing/pulling would be nice - monotone and mercurial look like the top contenders in my book, but I need @@ -79,8 +89,5 @@ **** BUGS **** * Removal of conflicts on -A and -U (INCOMPLETE) -* gensync: get all info from packages instead of PKGBUILDs - for now, we only need to check the PKGBUILD in case of a - 'force' option * pacman: add pactest cases/functionality for all -Q operations and make sure the output is sane

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (9 files)
by Aaron Griffin 21 Feb '07

21 Feb '07

Date: Wednesday, February 21, 2007 @ 01:44:15 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: alpm.h (1.76 -> 1.77) be_files.c (1.27 -> 1.28) cache.c (1.30 -> 1.31) conflict.c (1.39 -> 1.40) db.c (1.59 -> 1.60) handle.c (1.32 -> 1.33) handle.h (1.15 -> 1.16) remove.c (1.68 -> 1.69) sync.c (1.101 -> 1.102) * Re-added a compare function for syncpkg's - it was removed without thinking properly * Error when re-reading the DB for replacements, wrong info level * Removed an duplicate debug message "checking for package replacements" * Check ignorepkg for REAL upgrades... * Properly check the NOSAVE flag * some unlink_file (remove.c) cleanup * fix indent level on handle.c * Force libalpm paths to end with a '/' char * Fixed 'target' looping in conflict.c (pmsyncpkg_t, not pmpkg_t) * Added some debug output to cache and db scanning ** All pactest tests succeed again, yay ** ------------+ alpm.h | 4 +- be_files.c | 6 ++-- cache.c | 4 ++ conflict.c | 10 ++++++- db.c | 2 - handle.c | 79 +++++++++++++++++++++++++++++++++++++++++------------------ handle.h | 2 - remove.c | 26 +++++++++++-------- sync.c | 43 +++++++++++++++++--------------- 9 files changed, 114 insertions(+), 62 deletions(-) Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.76 pacman-lib/lib/libalpm/alpm.h:1.77 --- pacman-lib/lib/libalpm/alpm.h:1.76 Sun Feb 11 23:45:22 2007 +++ pacman-lib/lib/libalpm/alpm.h Wed Feb 21 01:44:14 2007 @@ -35,8 +35,8 @@ */ #define PM_ROOT "/" -#define PM_DBPATH "var/lib/pacman" -#define PM_CACHEDIR "var/cache/pacman/pkg" +#define PM_DBPATH "var/lib/pacman/" +#define PM_CACHEDIR "var/cache/pacman/pkg/" #define PM_LOCK "tmp/pacman.lck" Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.27 pacman-lib/lib/libalpm/be_files.c:1.28 --- pacman-lib/lib/libalpm/be_files.c:1.27 Mon Feb 12 20:46:33 2007 +++ pacman-lib/lib/libalpm/be_files.c Wed Feb 21 01:44:14 2007 @@ -72,6 +72,7 @@ RET_ERR(PM_ERR_DB_NULL, -1); } + _alpm_log(PM_LOG_DEBUG, _("opening database from path '%s'"), db->path); db->handle = opendir(db->path); if(db->handle == NULL) { RET_ERR(PM_ERR_DB_OPEN, -1); @@ -154,8 +155,7 @@ if(!found) { return(NULL); } - } else { - /* normal iteration */ + } else { /* target == NULL, full scan */ int isdir = 0; while(!isdir) { ent = readdir(db->handle); @@ -176,6 +176,7 @@ pkg = _alpm_pkg_new(NULL, NULL); if(pkg == NULL) { + _alpm_log(PM_LOG_DEBUG, _("db scan could not find package: %s"), target); return(NULL); } if(_alpm_pkg_splitname(ent->d_name, pkg->name, pkg->version, 0) == -1) { @@ -188,6 +189,7 @@ } } + _alpm_log(PM_LOG_DEBUG, _("db scan found package: %s"), pkg->name); return(pkg); } Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.30 pacman-lib/lib/libalpm/cache.c:1.31 --- pacman-lib/lib/libalpm/cache.c:1.30 Wed Jan 31 01:48:06 2007 +++ pacman-lib/lib/libalpm/cache.c Wed Feb 21 01:44:14 2007 @@ -61,6 +61,7 @@ _alpm_db_rewind(db); while((info = _alpm_db_scan(db, NULL, infolevel)) != NULL) { + _alpm_log(PM_LOG_DEBUG, _("adding '%s' to package cache for db '%s'"), info->name, db->treename); info->origin = PKG_FROM_CACHE; info->data = db; /* add to the collection */ @@ -104,6 +105,9 @@ _alpm_db_ensure_pkgcache(db, infolevel); + if(!db->pkgcache) { + _alpm_log(PM_LOG_DEBUG, _("error: pkgcache is NULL for db %s"), db->treename); + } return(db->pkgcache); } Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.39 pacman-lib/lib/libalpm/conflict.c:1.40 --- pacman-lib/lib/libalpm/conflict.c:1.39 Mon Feb 19 21:14:27 2007 +++ pacman-lib/lib/libalpm/conflict.c Wed Feb 21 01:44:14 2007 @@ -379,9 +379,16 @@ /* stat the file - if it exists and is not a dir, do some checks */ if(lstat(path, &buf) == 0 && !S_ISDIR(buf.st_mode)) { + /* Look at all the targets to see if file has changed hands */ for(k = targets; k; k = k->next) { - p2 = (pmpkg_t *)k->data; + pmsyncpkg_t *sync = k->data; + if(!sync) { + continue; + } + + p2 = sync->pkg; + /* Ensure we aren't looking at current package */ if(p2 == p1) { continue; @@ -404,6 +411,7 @@ _alpm_log(PM_LOG_DEBUG, "file changed packages, adding to remove skiplist: %s", filestr); } } else { + _alpm_log(PM_LOG_DEBUG, "file found in conflict: %s", filestr); conflicts = add_fileconflict(conflicts, PM_CONFLICT_TYPE_FILE, filestr, p1->name, NULL); break; Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.59 pacman-lib/lib/libalpm/db.c:1.60 --- pacman-lib/lib/libalpm/db.c:1.59 Wed Jan 31 01:10:21 2007 +++ pacman-lib/lib/libalpm/db.c Wed Feb 21 01:44:14 2007 @@ -71,7 +71,7 @@ FREE(db); RET_ERR(PM_ERR_MEMORY, NULL); } - sprintf(db->path, "%s%s/%s", root, dbpath, treename); + sprintf(db->path, "%s%s%s", root, dbpath, treename); STRNCPY(db->treename, treename, PATH_MAX); Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.32 pacman-lib/lib/libalpm/handle.c:1.33 --- pacman-lib/lib/libalpm/handle.c:1.32 Sun Feb 11 23:45:22 2007 +++ pacman-lib/lib/libalpm/handle.c Wed Feb 21 01:44:15 2007 @@ -66,28 +66,29 @@ /* see if we're root or not (fakeroot does not count) */ #ifndef FAKEROOT if(handle->uid == 0 && !getenv("FAKEROOTKEY")) { + /* } make vim indent work - stupid ifdef's */ #else - if(handle->uid == 0) { + if(handle->uid == 0) { #endif - handle->access = PM_ACCESS_RW; - } else { - handle->access = PM_ACCESS_RO; - } + handle->access = PM_ACCESS_RW; + } else { + handle->access = PM_ACCESS_RO; + } #else handle->access = PM_ACCESS_RW; #endif - handle->root = strdup(PM_ROOT); + handle->root = strdup(PM_ROOT); handle->dbpath = strdup(PM_DBPATH); handle->cachedir = strdup(PM_CACHEDIR); - handle->logmask = PM_LOG_ERROR | PM_LOG_WARNING; + handle->logmask = PM_LOG_ERROR | PM_LOG_WARNING; return(handle); } int _alpm_handle_free(pmhandle_t *handle) { - ALPM_LOG_FUNC; + ALPM_LOG_FUNC; ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); @@ -139,7 +140,7 @@ pmdb_t *alpm_option_get_localdb() { return handle->db_local; } alpm_list_t SYMEXPORT *alpm_option_get_syncdbs() { - return handle->dbs_sync; + return handle->dbs_sync; } void SYMEXPORT alpm_option_set_logcb(alpm_cb_log cb) { handle->logcb = cb; } @@ -151,24 +152,54 @@ void alpm_option_set_root(const char *root) { if(handle->root) FREE(handle->root); - if(root) handle->root = strdup(root); + if(root) { + /* verify root ends in a '/' */ + int rootlen = strlen(root); + if(root[rootlen-1] != '/') { + rootlen += 1; + } + handle->root = calloc(rootlen+1, sizeof(char)); + strncpy(handle->root, root, rootlen); + handle->root[rootlen-1] = '/'; + _alpm_log(PM_LOG_DEBUG, _("option 'root' = %s"), handle->root); + } } void SYMEXPORT alpm_option_set_dbpath(const char *dbpath) { - if(handle->dbpath) FREE(handle->dbpath); - if(dbpath) handle->dbpath = strdup(dbpath); + if(handle->dbpath) FREE(handle->dbpath); + if(dbpath) { + /* verify dbpath ends in a '/' */ + int dbpathlen = strlen(dbpath); + if(dbpath[dbpathlen-1] != '/') { + dbpathlen += 1; + } + handle->dbpath = calloc(dbpathlen+1, sizeof(char)); + strncpy(handle->dbpath, dbpath, dbpathlen); + handle->dbpath[dbpathlen-1] = '/'; + _alpm_log(PM_LOG_DEBUG, _("option 'dbpath' = %s"), handle->dbpath); + } } void alpm_option_set_cachedir(const char *cachedir) { - if(handle->cachedir) FREE(handle->cachedir); - if(cachedir) handle->cachedir = strdup(cachedir); + if(handle->cachedir) FREE(handle->cachedir); + if(cachedir) { + /* verify cachedir ends in a '/' */ + int cachedirlen = strlen(cachedir); + if(cachedir[cachedirlen-1] != '/') { + cachedirlen += 1; + } + handle->cachedir = calloc(cachedirlen+1, sizeof(char)); + strncpy(handle->cachedir, cachedir, cachedirlen); + handle->cachedir[cachedirlen-1] = '/'; + _alpm_log(PM_LOG_DEBUG, _("option 'cachedir' = %s"), handle->cachedir); + } } void alpm_option_set_logfile(const char *logfile) { - ALPM_LOG_FUNC; + ALPM_LOG_FUNC; if(handle->logfile) { FREE(handle->logfile); @@ -185,12 +216,12 @@ void alpm_option_set_usesyslog(unsigned short usesyslog) { - handle->usesyslog = usesyslog; + handle->usesyslog = usesyslog; } void alpm_option_add_noupgrade(char *pkg) { - handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); + handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(pkg)); } void alpm_option_set_noupgrades(alpm_list_t *noupgrade) @@ -201,7 +232,7 @@ void alpm_option_add_noextract(char *pkg) { - handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); + handle->noextract = alpm_list_add(handle->noextract, strdup(pkg)); } void alpm_option_set_noextracts(alpm_list_t *noextract) { @@ -211,7 +242,7 @@ void SYMEXPORT alpm_option_add_ignorepkg(char *pkg) { - handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); + handle->ignorepkg = alpm_list_add(handle->ignorepkg, strdup(pkg)); } void alpm_option_set_ignorepkgs(alpm_list_t *ignorepkgs) { @@ -221,7 +252,7 @@ void alpm_option_add_holdpkg(char *pkg) { - handle->holdpkg = alpm_list_add(handle->holdpkg, strdup(pkg)); + handle->holdpkg = alpm_list_add(handle->holdpkg, strdup(pkg)); } void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs) { @@ -231,7 +262,7 @@ void alpm_option_set_upgradedelay(time_t delay) { - handle->upgradedelay = delay; + handle->upgradedelay = delay; } void alpm_option_set_xfercommand(const char *cmd) @@ -242,14 +273,14 @@ void alpm_option_set_nopassiveftp(unsigned short nopasv) { - handle->nopassiveftp = nopasv; + handle->nopassiveftp = nopasv; } void alpm_option_set_chomp(unsigned short chomp) { handle->chomp = chomp; } void alpm_option_set_usecolor(unsigned short usecolor) { - handle->use_color = usecolor; + handle->use_color = usecolor; } -/* vim: set ts=2 sw=2 et: */ +/* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/handle.h diff -u pacman-lib/lib/libalpm/handle.h:1.15 pacman-lib/lib/libalpm/handle.h:1.16 --- pacman-lib/lib/libalpm/handle.h:1.15 Sun Feb 11 23:45:22 2007 +++ pacman-lib/lib/libalpm/handle.h Wed Feb 21 01:44:15 2007 @@ -69,7 +69,7 @@ #define FREEHANDLE(p) do { if (p) { _alpm_handle_free(p); p = NULL; } } while (0) -pmhandle_t *_alpm_handle_new(void); +pmhandle_t *_alpm_handle_new(); int _alpm_handle_free(pmhandle_t *handle); #endif /* _ALPM_HANDLE_H */ Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.68 pacman-lib/lib/libalpm/remove.c:1.69 --- pacman-lib/lib/libalpm/remove.c:1.68 Mon Feb 19 21:14:27 2007 +++ pacman-lib/lib/libalpm/remove.c Wed Feb 21 01:44:15 2007 @@ -206,10 +206,11 @@ FREE(hash); } - if(!needbackup && trans->type == PM_TRANS_TYPE_UPGRADE) { + if(trans->type == PM_TRANS_TYPE_UPGRADE) { /* check noupgrade */ if(alpm_list_find_str(handle->noupgrade, lp->data)) { - needbackup = 1; + _alpm_log(PM_LOG_DEBUG, _("Skipping removal of '%s' due to NoUpgrade"), file); + return; } } @@ -232,28 +233,31 @@ * explanation. */ if(alpm_list_find_str(trans->skip_remove, file)) { _alpm_log(PM_LOG_DEBUG, _("%s is in trans->skip_remove, skipping removal"), file); + return; } else if(needbackup) { /* if the file is flagged, back it up to .pacsave */ if(!(trans->type == PM_TRANS_TYPE_UPGRADE)) { /* if it was an upgrade, the file would be left alone because * pacman_add() would handle it */ - if(!(trans->type & PM_TRANS_FLAG_NOSAVE)) { + if(!(trans->flags & PM_TRANS_FLAG_NOSAVE)) { char newpath[PATH_MAX]; snprintf(newpath, PATH_MAX, "%s.pacsave", file); rename(file, newpath); _alpm_log(PM_LOG_WARNING, _("%s saved as %s"), file, newpath); + return; + } else { + _alpm_log(PM_LOG_DEBUG, _("transaction is set to NOSAVE, not backing up '%s'"), file); } } - } else { - _alpm_log(PM_LOG_DEBUG, _("unlinking %s"), file); - int list_count = alpm_list_count(trans->packages); /* this way we don't have to call alpm_list_count twice during PROGRESS */ + } + _alpm_log(PM_LOG_DEBUG, _("unlinking %s"), file); + int list_count = alpm_list_count(trans->packages); /* this way we don't have to call alpm_list_count twice during PROGRESS */ - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), list_count, (list_count - alpm_list_count(targ) + 1)); - ++(*position); + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, (double)(percent * 100), list_count, (list_count - alpm_list_count(targ) + 1)); + ++(*position); - if(unlink(file) == -1) { - _alpm_log(PM_LOG_ERROR, _("cannot remove file %s: %s"), lp->data, strerror(errno)); - } + if(unlink(file) == -1) { + _alpm_log(PM_LOG_ERROR, _("cannot remove file %s: %s"), lp->data, strerror(errno)); } } } Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.101 pacman-lib/lib/libalpm/sync.c:1.102 --- pacman-lib/lib/libalpm/sync.c:1.101 Tue Feb 13 03:15:38 2007 +++ pacman-lib/lib/libalpm/sync.c Wed Feb 21 01:44:15 2007 @@ -128,7 +128,7 @@ /* check for "recommended" package replacements */ _alpm_log(PM_LOG_DEBUG, _("checking for package replacements")); for(i = dbs_sync; i; i = i->next) { - for(j = _alpm_db_get_pkgcache(i->data, INFRQ_DESC); j; j = j->next) { + for(j = _alpm_db_get_pkgcache(i->data, INFRQ_DEPENDS); j; j = j->next) { pmpkg_t *spkg = j->data; for(k = spkg->replaces; k; k = k->next) { alpm_list_t *m; @@ -194,7 +194,6 @@ ALPM_LOG_FUNC; /* check for "recommended" package replacements */ - _alpm_log(PM_LOG_DEBUG, _("checking for package replacements")); if( find_replacements(trans, db_local, dbs_sync) == 0 ) { /* match installed packages with the sync dbs and compare versions */ _alpm_log(PM_LOG_DEBUG, _("checking for package upgrades")); @@ -229,19 +228,24 @@ /* compare versions and see if we need to upgrade */ if(alpm_pkg_compare_versions(local, spkg)) { - _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), - local->name, local->version, local->version, spkg->version); - if(!find_pkginsync(spkg->name, trans->packages)) { - pmpkg_t *dummy = _alpm_pkg_new(local->name, local->version); - if(dummy == NULL) { - goto error; - } - sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); - if(sync == NULL) { - FREEPKG(dummy); - goto error; + if(alpm_list_find_str(handle->ignorepkg, local->name)) { + _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s => %s)"), + local->name, local->version, local->version, spkg->version); + } else { + _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), + local->name, local->version, local->version, spkg->version); + if(!find_pkginsync(spkg->name, trans->packages)) { + pmpkg_t *dummy = _alpm_pkg_new(local->name, local->version); + if(dummy == NULL) { + goto error; + } + sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy); + if(sync == NULL) { + FREEPKG(dummy); + goto error; + } + trans->packages = alpm_list_add(trans->packages, sync); } - trans->packages = alpm_list_add(trans->packages, sync); } } } @@ -358,11 +362,10 @@ /* Helper functions for alpm_list_remove */ -/* removed - use pkg_cmp all of the time -static int ptr_cmp(const void *s1, const void *s2) +static int syncpkg_cmp(const void *s1, const void *s2) { return(strcmp(((pmsyncpkg_t *)s1)->pkg->name, ((pmsyncpkg_t *)s2)->pkg->name)); -}*/ +} static int pkg_cmp(const void *p1, const void *p2) { @@ -554,8 +557,8 @@ if(rmpkg) { pmsyncpkg_t *rsync = find_pkginsync(rmpkg, trans->packages); void *vpkg; - _alpm_log(PM_LOG_DEBUG, _("removing '%s' from target list"), rmpkg); - trans->packages = alpm_list_remove(trans->packages, rsync, pkg_cmp, &vpkg); + _alpm_log(PM_LOG_DEBUG, _("removing '%s' from target list"), rsync->pkg->name); + trans->packages = alpm_list_remove(trans->packages, rsync, syncpkg_cmp, &vpkg); FREESYNC(vpkg); continue; } @@ -592,7 +595,7 @@ /* remove it from the target list */ void *vpkg; _alpm_log(PM_LOG_DEBUG, _("removing '%s' from target list"), miss->depend.name); - trans->packages = alpm_list_remove(trans->packages, rsync, pkg_cmp, &vpkg); + trans->packages = alpm_list_remove(trans->packages, rsync, syncpkg_cmp, &vpkg); FREESYNC(vpkg); } } else {

1 0

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

21 Feb '07

Date: Wednesday, February 21, 2007 @ 01:35:07 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: Makefile.am (1.14 -> 1.15) * Use the libtool'd .la file as a link target so we can run pactest properly -------------+ Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.14 pacman-lib/src/pacman/Makefile.am:1.15 --- pacman-lib/src/pacman/Makefile.am:1.14 Sat Feb 10 04:34:59 2007 +++ pacman-lib/src/pacman/Makefile.am Wed Feb 21 01:35:07 2007 @@ -16,7 +16,7 @@ pacman_static_SOURCES = $(pacman_SOURCES) -pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so \ +pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \ -ldownload pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la \

1 0

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

21 Feb '07

Date: Wednesday, February 21, 2007 @ 01:33:13 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest Modified: pactest.py (1.1 -> 1.2) pmdb.py (1.1 -> 1.2) pmenv.py (1.1 -> 1.2) pmfile.py (1.1 -> 1.2) pmpkg.py (1.1 -> 1.2) pmrule.py (1.1 -> 1.2) pmtest.py (1.1 -> 1.2) tests/sync897.py (1.1 -> 1.2) tests/sync899.py (1.1 -> 1.2) util.py (1.1 -> 1.2) * Indentation changes - 4 spaces for python, we standardized this before (and it's a PEP) * Modified some sync tests ------------------+ pactest.py | 67 ++--- pmdb.py | 641 ++++++++++++++++++++++++++--------------------------- pmenv.py | 175 +++++++------- pmfile.py | 55 ++-- pmpkg.py | 293 ++++++++++++------------ pmrule.py | 211 ++++++++--------- pmtest.py | 435 ++++++++++++++++++----------------- tests/sync897.py | 1 tests/sync899.py | 2 util.py | 313 ++++++++++++------------- 10 files changed, 1101 insertions(+), 1092 deletions(-) The diff is longer than the limit of 39KB.

1 0