January 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] CVS update of pacman-lib/scripts (aurbuild)
by Aaron Griffin 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 01:31:18 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Removed: aurbuild (1.2) This is a silly script now that a fancy aurbuild is out in the wild (on the AUR, surprisingly enough, heh) ----------+ aurbuild | 25 ------------------------- 1 file changed, 25 deletions(-) Index: pacman-lib/scripts/aurbuild diff -u pacman-lib/scripts/aurbuild:1.2 pacman-lib/scripts/aurbuild:removed --- pacman-lib/scripts/aurbuild:1.2 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/aurbuild Tue Jan 30 01:31:18 2007 @@ -1,25 +0,0 @@ -#!/bin/bash - -die() { - echo $* - exit 1 -} - -if [ "$1" == "" ]; then - echo "usage: aurbuild <package_name>" - echo - exit 1 -fi -pkgname=$1 -[ -d $pkgname ] && die "Directory '$pkgname' already exists" -[ -f $pkgname ] && die "File '$pkgname' already exists" - -echo "Downloading $pkgname.tar.gz" -wget -q http://aur.archlinux.org/packages/$pkgname/$pkgname.tar.gz || die "Failed to fetch $1.pkg.tar.gz" - -tar zxf $pkgname.tar.gz || die "Extraction failed" -rm -f $pkgname.tar.gz -cd $pkgname || die "Failed to cwd" -makepkg - -# vim: set ts=2 sw=2 noet:

1 0

[pacman-dev] CVS update of pacman-lib (6 files)
by dan＠archlinux.org 30 Jan '07

30 Jan '07

Date: Tuesday, January 30, 2007 @ 00:41:13 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/Makefile.am (1.15 -> 1.16) lib/libalpm/add.c (1.104 -> 1.105) lib/libalpm/deps.c (1.60 -> 1.61) lib/libalpm/util.c (1.41 -> 1.42) scripts/makeworld (1.6 -> 1.7) src/pacman/sync.c (1.100 -> 1.101) * Remove -fno-strict-aliasing as it is now unnecessary to compile. * Fix up add.c a bit better than it was in regards to FS #3492. * Optimized the sqrt call in dependency cycle checking to a single call. * Removal of an outdated comment. -------------------------+ lib/libalpm/Makefile.am | 4 +--- lib/libalpm/add.c | 32 +++++++++++++++++++++++++------- lib/libalpm/deps.c | 13 ++++++------- lib/libalpm/util.c | 4 ++-- scripts/makeworld | 2 +- src/pacman/sync.c | 1 - 6 files changed, 35 insertions(+), 21 deletions(-) Index: pacman-lib/lib/libalpm/Makefile.am diff -u pacman-lib/lib/libalpm/Makefile.am:1.15 pacman-lib/lib/libalpm/Makefile.am:1.16 --- pacman-lib/lib/libalpm/Makefile.am:1.15 Mon Jan 29 17:18:31 2007 +++ pacman-lib/lib/libalpm/Makefile.am Tue Jan 30 00:41:13 2007 @@ -1,8 +1,6 @@ AUTOMAKE_OPTIONS = gnu DEFINES = -pedantic -D_GNU_SOURCE -#libalpm isn't fully C99 safe with the strict aliasing rules -# to be fixed in the future -AM_CFLAGS = $(DEFINES) -fno-strict-aliasing +AM_CFLAGS = $(DEFINES) SUBDIRS = po localedir = $(datadir)/locale Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.104 pacman-lib/lib/libalpm/add.c:1.105 --- pacman-lib/lib/libalpm/add.c:1.104 Mon Jan 29 22:46:33 2007 +++ pacman-lib/lib/libalpm/add.c Tue Jan 30 00:41:13 2007 @@ -211,9 +211,12 @@ } -static int name_cmp(const void *p1, const void *p2) +/* This is still messy. We have a lot of compare functions, and we should + * try to consolidate them as much as we can (between add and sync) */ +static int pkg_cmp(const void *p1, const void *p2) { - return(strcmp(((pmpkg_t *)p1)->name, (const char *)p2)); + return(strcmp(((pmdepmissing_t *)p1)->target, + ((pmdepmissing_t *)p2)->target)); } int _alpm_add_prepare(pmtrans_t *trans, pmdb_t *db, alpm_list_t **data) @@ -253,11 +256,26 @@ /* Attempt to resolve conflicts */ QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &skip_this); if(skip_this) { - pmpkg_t **pkg = NULL; - lp = alpm_list_remove(lp, (void *)miss->depend.name, name_cmp, (void **)pkg); - FREEPKG(*pkg); - } - } + pmdepmissing_t *pkg = NULL; + lp = alpm_list_remove(lp, (void *)miss, pkg_cmp, (void*)&pkg); + /* TODO: We remove the conflict from the list but never actually remove + * the package. Need to do this to fix FS #3492. The sync code should + * provide an example of how to do this, as it handles replaces and + * removes. We run into problems because we do a file conflict check + * below and it fails there. A force flag will skip that part, but + * still not remove the original package designated here for removal. + * Better yet, dump all this shitty duplicate code and somehow combine + * it with the sync code. */ + FREE(pkg); + 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 + * with the codebase. */ if(lp != NULL) { if(data) { *data = lp; Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.60 pacman-lib/lib/libalpm/deps.c:1.61 --- pacman-lib/lib/libalpm/deps.c:1.60 Mon Jan 29 22:46:33 2007 +++ pacman-lib/lib/libalpm/deps.c Tue Jan 30 00:41:13 2007 @@ -106,6 +106,7 @@ int change = 1; int numscans = 0; int numtargs = 0; + int maxscans; if(targets == NULL) { return(NULL); @@ -116,15 +117,13 @@ numtargs++; } + maxscans = (int)sqrt(numtargs); + _alpm_log(PM_LOG_DEBUG, _("started sorting dependencies")); while(change) { alpm_list_t *tmptargs = NULL; change = 0; - /* TODO only use of a math.h function in entire libalpm, - * can we get rid of it? Former code line: - *if(numscans > numtargs) { - */ - if(numscans > sqrt(numtargs)) { + if(numscans > maxscans) { _alpm_log(PM_LOG_DEBUG, _("possible dependency cycle detected")); continue; } @@ -321,9 +320,9 @@ /* else if still not found... */ if(!found) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as a dependency for %s"), - depend.name, tp->name); + depend.name, tp->name); miss = _alpm_depmiss_new(tp->name, PM_DEP_TYPE_DEPEND, depend.mod, - depend.name, depend.version); + depend.name, depend.version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.41 pacman-lib/lib/libalpm/util.c:1.42 --- pacman-lib/lib/libalpm/util.c:1.41 Thu Jan 25 20:33:03 2007 +++ pacman-lib/lib/libalpm/util.c Tue Jan 30 00:41:13 2007 @@ -359,8 +359,8 @@ /* Use ISO-8601 date format */ fprintf(f, "[%04d-%02d-%02d %02d:%02d] %s\n", - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, str); + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min, str); fflush(f); } Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.6 pacman-lib/scripts/makeworld:1.7 --- pacman-lib/scripts/makeworld:1.6 Thu Jan 25 21:13:16 2007 +++ pacman-lib/scripts/makeworld Tue Jan 30 00:41:13 2007 @@ -148,7 +148,7 @@ fi done done -ed=`date +"[%b %d %H:%M]"` +ed=$(date +"[%b %d %H:%M]") echo "makeworld complete." >>$toplevel/build.log echo " started: $sd" >>$toplevel/build.log Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.100 pacman-lib/src/pacman/sync.c:1.101 --- pacman-lib/src/pacman/sync.c:1.100 Mon Jan 29 22:46:34 2007 +++ pacman-lib/src/pacman/sync.c Tue Jan 30 00:41:13 2007 @@ -526,7 +526,6 @@ found++; MSG(NL, _(":: group %s:\n"), targ); /* remove dupe entries in case a package exists in multiple repos */ - /* (the dupe function takes a pmlist_t* and returns a list_t*) */ alpm_list_t *pkgs = alpm_list_remove_dupes(alpm_grp_get_packages(grp)); list_display(" ", pkgs); if(yesno(_(":: Install whole content? [Y/n] "))) {

1 0

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

30 Jan '07

Date: Monday, January 29, 2007 @ 23:15:14 Author: dan Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: package.c (1.24 -> 1.25) * Modified info query so it doesn't show more than available when querying a package file. -----------+ package.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.24 pacman-lib/src/pacman/package.c:1.25 --- pacman-lib/src/pacman/package.c:1.24 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/package.c Mon Jan 29 23:15:14 2007 @@ -34,6 +34,10 @@ #include "package.h" /* Display the content of an installed package + * + * level: <1 - omits N/A info for file query (-Qp) + * 1 - normal level + * >1 - extra information (backup files) */ void dump_pkg_full(pmpkg_t *pkg, int level) { @@ -69,25 +73,28 @@ list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - /* TODO only applicable if querying installed package, not a file */ - list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + /* Only applicable if installed */ + if(level > 0) { + list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + } list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); - /* TODO only applicable if querying installed package, not a file */ - printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); - printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); - printf(_("Reason : %s\n"), reason); + if(level > 0) { + printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + printf(_("Install Reason : %s\n"), reason); + } + printf(_("Install Script : %s\n"), + alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); printf("\n"); /* Print additional package info if info flag passed more than once */ - /* TODO only applicable if querying installed package, not a file */ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg);

1 0

[pacman-dev] CVS update of pacman-lib (14 files)
by dan＠archlinux.org 30 Jan '07

30 Jan '07

Date: Monday, January 29, 2007 @ 22:46:34 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/add.c (1.103 -> 1.104) lib/libalpm/alpm.c (1.106 -> 1.107) lib/libalpm/alpm_list.c (1.4 -> 1.5) lib/libalpm/alpm_list.h (1.2 -> 1.3) lib/libalpm/cache.c (1.27 -> 1.28) lib/libalpm/conflict.c (1.31 -> 1.32) lib/libalpm/deps.c (1.59 -> 1.60) lib/libalpm/provide.c (1.8 -> 1.9) lib/libalpm/remove.c (1.57 -> 1.58) lib/libalpm/server.c (1.16 -> 1.17) lib/libalpm/sync.c (1.92 -> 1.93) lib/libalpm/trans.c (1.31 -> 1.32) lib/libalpm/versioncmp.c (1.9 -> 1.10) src/pacman/sync.c (1.99 -> 1.100) Discussed on IRC for a bit, this makes the following changes for clarity: * alpm_list_is_in --> alpm_list_find * alpm_list_is_strin --> alpm_list_find_str * Flip parameters of both functions to be inline with rest of alpm_list. First commit, woohoo. --------------------------+ lib/libalpm/add.c | 6 +++--- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm_list.c | 8 ++++---- lib/libalpm/alpm_list.h | 4 ++-- lib/libalpm/cache.c | 4 ++-- lib/libalpm/conflict.c | 7 ++++--- lib/libalpm/deps.c | 6 +++--- lib/libalpm/provide.c | 2 +- lib/libalpm/remove.c | 5 +++-- lib/libalpm/server.c | 2 +- lib/libalpm/sync.c | 14 +++++++------- lib/libalpm/trans.c | 2 +- lib/libalpm/versioncmp.c | 3 ++- src/pacman/sync.c | 4 ++-- 14 files changed, 36 insertions(+), 33 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.103 pacman-lib/lib/libalpm/add.c:1.104 --- pacman-lib/lib/libalpm/add.c:1.103 Tue Jan 23 22:02:53 2007 +++ pacman-lib/lib/libalpm/add.c Mon Jan 29 22:46:33 2007 @@ -507,7 +507,7 @@ * eg, /home/httpd/html/index.html may be removed so index.php * could be used. */ - if(alpm_list_is_strin(pathname, handle->noextract)) { + if(alpm_list_find_str(handle->noextract, pathname)) { alpm_logaction(_("notice: %s is in NoExtract -- skipping extraction"), pathname); archive_read_data_skip (archive); continue; @@ -516,7 +516,7 @@ if(!stat(expath, &buf) && !S_ISDIR(buf.st_mode)) { /* file already exists */ if(!pmo_upgrade || oldpkg == NULL) { - nb = alpm_list_is_strin(pathname, info->backup); + nb = alpm_list_find_str(info->backup, pathname); } else { /* op == PM_TRANS_TYPE_UPGRADE */ md5_orig = _alpm_needbackup(pathname, oldpkg->backup); @@ -525,7 +525,7 @@ nb = 1; } } - if(alpm_list_is_strin(pathname, handle->noupgrade)) { + if(alpm_list_find_str(handle->noupgrade, pathname)) { notouch = 1; nb = 0; } Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.106 pacman-lib/lib/libalpm/alpm.c:1.107 --- pacman-lib/lib/libalpm/alpm.c:1.106 Thu Jan 25 21:13:16 2007 +++ pacman-lib/lib/libalpm/alpm.c Mon Jan 29 22:46:33 2007 @@ -265,7 +265,7 @@ ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - if(!alpm_list_is_in(db, handle->dbs_sync)) { + if(!alpm_list_find(handle->dbs_sync, db)) { RET_ERR(PM_ERR_DB_NOT_FOUND, -1); } Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.4 pacman-lib/lib/libalpm/alpm_list.c:1.5 --- pacman-lib/lib/libalpm/alpm_list.c:1.4 Wed Jan 24 03:51:51 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Mon Jan 29 22:46:33 2007 @@ -309,7 +309,7 @@ { /* TODO does removing the strdup here cause invalid free's anywhere? */ alpm_list_t *lp = list, *newlist = NULL; while(lp) { - if(!alpm_list_is_in(lp->data, newlist)) { + if(!alpm_list_find(newlist, lp->data)) { newlist = alpm_list_add(newlist, lp->data); } lp = lp->next; @@ -426,7 +426,7 @@ * @param haystack the list to search * @return 1 if `needle` is found, 0 otherwise */ -int alpm_list_is_in(const void *needle, alpm_list_t *haystack) +int alpm_list_find(alpm_list_t *haystack, const void *needle) { alpm_list_t *lp = haystack; while(lp) { @@ -440,12 +440,12 @@ /* Test for existence of a string in a alpm_list_t */ -/** Is a _string_ in the list (optimization of alpm_list_is_in for strings) +/** Is a _string_ in the list (optimization of alpm_list_find for strings) * @param needle the string to compare * @param haystack the list to search * @return 1 if `needle` is found, 0 otherwise */ -int alpm_list_is_strin(const char *needle, alpm_list_t *haystack) +int alpm_list_find_str(alpm_list_t *haystack, const char *needle) { alpm_list_t *lp = haystack; while(lp) { Index: pacman-lib/lib/libalpm/alpm_list.h diff -u pacman-lib/lib/libalpm/alpm_list.h:1.2 pacman-lib/lib/libalpm/alpm_list.h:1.3 --- pacman-lib/lib/libalpm/alpm_list.h:1.2 Wed Jan 24 03:51:51 2007 +++ pacman-lib/lib/libalpm/alpm_list.h Mon Jan 29 22:46:33 2007 @@ -64,8 +64,8 @@ /* misc */ int alpm_list_count(const alpm_list_t *list); -int alpm_list_is_in(const void *needle, alpm_list_t *haystack); -int alpm_list_is_strin(const char *needle, alpm_list_t *haystack); +int alpm_list_find(alpm_list_t *haystack, const void *needle); +int alpm_list_find_str(alpm_list_t *haystack,const char *needle); #endif /* _ALPM_LIST_H */ Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.27 pacman-lib/lib/libalpm/cache.c:1.28 --- pacman-lib/lib/libalpm/cache.c:1.27 Wed Jan 24 03:51:51 2007 +++ pacman-lib/lib/libalpm/cache.c Mon Jan 29 22:46:33 2007 @@ -202,7 +202,7 @@ pmpkg_t *pkg = lp->data; for(i = pkg->groups; i; i = i->next) { - if(!alpm_list_is_strin(i->data, db->grpcache)) { + if(!alpm_list_find_str(db->grpcache, i->data)) { pmgrp_t *grp = _alpm_grp_new(); STRNCPY(grp->name, (char *)i->data, GRP_NAME_LEN); @@ -215,7 +215,7 @@ pmgrp_t *grp = j->data; if(strcmp(grp->name, i->data) == 0) { - if(!alpm_list_is_strin(pkg->name, grp->packages)) { + if(!alpm_list_find_str(grp->packages, pkg->name)) { grp->packages = alpm_list_add_sorted(grp->packages, (char *)pkg->name, _alpm_grp_cmp); } } Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.31 pacman-lib/lib/libalpm/conflict.c:1.32 --- pacman-lib/lib/libalpm/conflict.c:1.31 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/conflict.c Mon Jan 29 22:46:33 2007 @@ -240,7 +240,7 @@ if(strcmp(filestr, ".INSTALL") == 0) { continue; } - if(alpm_list_is_strin(filestr, p2->files)) { + if(alpm_list_find_str(p2->files, filestr)) { pmconflict_t *conflict = malloc(sizeof(pmconflict_t)); if(conflict == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), @@ -284,7 +284,7 @@ _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name); _alpm_db_read(db, INFRQ_FILES, dbpkg); } - if(dbpkg && alpm_list_is_strin(j->data, dbpkg->files)) { + if(dbpkg && alpm_list_find_str(dbpkg->files, j->data)) { ok = 1; } /* Make sure that the supposedly-conflicting file is not actually just @@ -315,7 +315,8 @@ _alpm_db_read(db, INFRQ_FILES, dbpkg2); } /* If it used to exist in there, but doesn't anymore */ - if(dbpkg2 && !alpm_list_is_strin(filestr, p1->files) && alpm_list_is_strin(filestr, dbpkg2->files)) { + if(dbpkg2 && !alpm_list_find_str(p1->files, filestr) + && alpm_list_find_str(dbpkg2->files, filestr)) { ok = 1; /* Add to the "skip list" of files that we shouldn't remove during an upgrade. * Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.59 pacman-lib/lib/libalpm/deps.c:1.60 --- pacman-lib/lib/libalpm/deps.c:1.59 Thu Jan 25 21:13:16 2007 +++ pacman-lib/lib/libalpm/deps.c Mon Jan 29 22:46:33 2007 @@ -363,7 +363,7 @@ spkg = k->data; } if(spkg) { - if(alpm_list_is_strin(tp->name, spkg->provides)) { + if(alpm_list_find_str(spkg->provides, tp->name)) { found = 1; } } @@ -549,7 +549,7 @@ /* check if one of the packages in *list already provides this dependency */ for(j = list; j && !found; j = j->next) { pmpkg_t *sp = (pmpkg_t *)j->data; - if(alpm_list_is_strin(miss->depend.name, sp->provides)) { + if(alpm_list_find_str(sp->provides, miss->depend.name)) { _alpm_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"), sp->name, miss->depend.name); found = 1; @@ -602,7 +602,7 @@ * something we're not supposed to. */ int usedep = 1; - if(alpm_list_is_strin(sync->name, handle->ignorepkg)) { + if(alpm_list_find_str(handle->ignorepkg, sync->name)) { pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &usedep); FREEPKG(dummypkg); Index: pacman-lib/lib/libalpm/provide.c diff -u pacman-lib/lib/libalpm/provide.c:1.8 pacman-lib/lib/libalpm/provide.c:1.9 --- pacman-lib/lib/libalpm/provide.c:1.8 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/provide.c Mon Jan 29 22:46:33 2007 @@ -42,7 +42,7 @@ for(lp = _alpm_db_get_pkgcache(db, INFRQ_DEPENDS); lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(alpm_list_is_strin(package, info->provides)) { + if(alpm_list_find_str(info->provides, package)) { pkgs = alpm_list_add(pkgs, info); } } Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.57 pacman-lib/lib/libalpm/remove.c:1.58 --- pacman-lib/lib/libalpm/remove.c:1.57 Tue Jan 23 11:05:21 2007 +++ pacman-lib/lib/libalpm/remove.c Mon Jan 29 22:46:33 2007 @@ -78,7 +78,8 @@ } /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) && alpm_list_is_strin(info->name, handle->holdpkg)) { + if((trans == handle->trans) + && alpm_list_find_str(handle->holdpkg, info->name)) { int resp = 0; QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); if(!resp) { @@ -177,7 +178,7 @@ FREE(checksum); } if ( !nb && trans->type == PM_TRANS_TYPE_UPGRADE ) { /* check noupgrade */ - if ( alpm_list_is_strin(file, handle->noupgrade) ) { + if ( alpm_list_find_str(handle->noupgrade, file) ) { nb = 1; } } Index: pacman-lib/lib/libalpm/server.c diff -u pacman-lib/lib/libalpm/server.c:1.16 pacman-lib/lib/libalpm/server.c:1.17 --- pacman-lib/lib/libalpm/server.c:1.16 Fri Jan 19 04:28:45 2007 +++ pacman-lib/lib/libalpm/server.c Mon Jan 29 22:46:33 2007 @@ -137,7 +137,7 @@ snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); - if(alpm_list_is_strin(fn, complete)) { + if(alpm_list_find_str(complete, fn)) { continue; } Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.92 pacman-lib/lib/libalpm/sync.c:1.93 --- pacman-lib/lib/libalpm/sync.c:1.92 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/sync.c Mon Jan 29 22:46:34 2007 @@ -137,7 +137,7 @@ pmpkg_t *lpkg = m->data; if(strcmp(k->data, lpkg->name) == 0) { _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); - if(alpm_list_is_strin(lpkg->name, handle->ignorepkg)) { + if(alpm_list_find_str(handle->ignorepkg, lpkg->name)) { _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), lpkg->name, lpkg->version, spkg->name, spkg->version); } else { @@ -235,7 +235,7 @@ local->name, local->version, db->treename, spkg->version); } else if(cmp == 0) { /* versions are identical */ - } else if(alpm_list_is_strin(spkg->name, handle->ignorepkg)) { + } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local->name, local->version, spkg->version); @@ -535,7 +535,7 @@ local = _alpm_db_get_pkgfromcache(db_local, miss->depend.name); /* check if this package also "provides" the package it's conflicting with */ - if(alpm_list_is_strin(miss->depend.name, sync->pkg->provides)) { + if(alpm_list_find_str(sync->pkg->provides, miss->depend.name)) { /* so just treat it like a "replaces" item so the REQUIREDBY * fields are inherited properly. */ @@ -559,8 +559,8 @@ /* figure out which one was requested in targets. If they both were, * then it's still an unresolvable conflict. */ - target = alpm_list_is_strin(miss->target, trans->targets); - depend = alpm_list_is_strin(miss->depend.name, trans->targets); + target = alpm_list_find_str(trans->targets, miss->target); + depend = alpm_list_find_str(trans->targets, miss->depend.name); if(depend && !target) { _alpm_log(PM_LOG_DEBUG, _("'%s' is in the target list -- keeping it"), miss->depend.name); @@ -591,7 +591,7 @@ _alpm_log(PM_LOG_DEBUG, _("resolving package '%s' conflict"), miss->target); if(local) { int doremove = 0; - if(!alpm_list_is_strin(miss->depend.name, asked)) { + if(!alpm_list_find_str(asked, miss->depend.name)) { QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &doremove); asked = alpm_list_add(asked, strdup(miss->depend.name)); if(doremove) { @@ -1020,7 +1020,7 @@ pmpkg_t *old = j->data; /* merge lists */ for(k = old->requiredby; k; k = k->next) { - if(!alpm_list_is_strin(k->data, new->requiredby)) { + if(!alpm_list_find_str(new->requiredby, k->data)) { /* replace old's name with new's name in the requiredby's dependency list */ alpm_list_t *m; pmpkg_t *depender = _alpm_db_get_pkgfromcache(db_local, k->data); Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.31 pacman-lib/lib/libalpm/trans.c:1.32 --- pacman-lib/lib/libalpm/trans.c:1.31 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/trans.c Mon Jan 29 22:46:34 2007 @@ -116,7 +116,7 @@ ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(alpm_list_is_strin(target, trans->targets)) { + if(alpm_list_find_str(trans->targets, target)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.9 pacman-lib/lib/libalpm/versioncmp.c:1.10 --- pacman-lib/lib/libalpm/versioncmp.c:1.9 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Mon Jan 29 22:46:34 2007 @@ -247,7 +247,8 @@ { int equal = 0; - if(strcmp(pkg->name, dep->name) == 0 || alpm_list_is_strin(dep->name, pkg->provides)) { + if(strcmp(pkg->name, dep->name) == 0 + || alpm_list_find_str(pkg->provides, dep->name)) { if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else { Index: pacman-lib/src/pacman/sync.c diff -u pacman-lib/src/pacman/sync.c:1.99 pacman-lib/src/pacman/sync.c:1.100 --- pacman-lib/src/pacman/sync.c:1.99 Wed Jan 24 03:51:51 2007 +++ pacman-lib/src/pacman/sync.c Mon Jan 29 22:46:34 2007 @@ -159,7 +159,7 @@ /* TODO Do not remove the currently installed version EITHER */ if(!strcmp(name, n)) { char *ptr = (alpm_pkg_vercmp(version, v) < 0) ? str : s; - if(!alpm_list_is_strin(ptr, clean)) { + if(!alpm_list_find_str(clean, ptr)) { clean = alpm_list_add(clean, strdup(ptr)); } } @@ -645,7 +645,7 @@ for(j = data; j; j = alpm_list_next(j)) { pmpkg_t *p = alpm_list_getdata(j); const char *pkgname = alpm_pkg_get_name(p); - if(!alpm_list_is_strin(pkgname, list_remove)) { + if(!alpm_list_find_str(list_remove, pkgname)) { list_remove = alpm_list_add(list_remove, strdup(pkgname)); } }

1 0

[pacman-dev] [patch] Clarify naming of alpm_list_is_in and alpm_list_is_strin
by Dan McGee 29 Jan '07

29 Jan '07

Discussed on IRC for a bit, this makes the following changes for clarity: alpm_list_is_in --> alpm_list_find alpm_list_is_strin --> alpm_list_find_str Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> ============================================================ --- lib/libalpm/add.c f7f5b94f49941840e59c8157645660cf1a3f36ed +++ lib/libalpm/add.c 0570d12d507222d69470ef4053f44a2bdaf57e6b @@ -521,7 +521,7 @@ int _alpm_add_commit(pmtrans_t *trans, p * eg, /home/httpd/html/index.html may be removed so index.php * could be used. */ - if(alpm_list_is_strin(pathname, handle->noextract)) { + if(alpm_list_find_str(pathname, handle->noextract)) { alpm_logaction(_("notice: %s is in NoExtract -- skipping extraction"), pathname); archive_read_data_skip (archive); continue; @@ -530,7 +530,7 @@ int _alpm_add_commit(pmtrans_t *trans, p if(!stat(expath, &buf) && !S_ISDIR(buf.st_mode)) { /* file already exists */ if(!pmo_upgrade || oldpkg == NULL) { - nb = alpm_list_is_strin(pathname, info->backup); + nb = alpm_list_find_str(pathname, info->backup); } else { /* op == PM_TRANS_TYPE_UPGRADE */ md5_orig = _alpm_needbackup(pathname, oldpkg->backup); @@ -539,7 +539,7 @@ int _alpm_add_commit(pmtrans_t *trans, p nb = 1; } } - if(alpm_list_is_strin(pathname, handle->noupgrade)) { + if(alpm_list_find_str(pathname, handle->noupgrade)) { notouch = 1; nb = 0; } ============================================================ --- lib/libalpm/alpm.c c21f46f9408260ed9ffb15cfa98a167ef0d4aec5 +++ lib/libalpm/alpm.c c6f1bfd08412853d58126614c236c8a5eb66d004 @@ -265,7 +265,7 @@ int alpm_db_update(int force, pmdb_t *db ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1)); ASSERT(handle->trans->type == PM_TRANS_TYPE_SYNC, RET_ERR(PM_ERR_TRANS_TYPE, -1)); - if(!alpm_list_is_in(db, handle->dbs_sync)) { + if(!alpm_list_find(db, handle->dbs_sync)) { RET_ERR(PM_ERR_DB_NOT_FOUND, -1); } ============================================================ --- lib/libalpm/alpm_list.c 89407ce88ca5365c8de6852ffbfbf864b1ca5443 +++ lib/libalpm/alpm_list.c e729ea1f26d90b87427613043842a0ebd969d5c7 @@ -309,7 +309,7 @@ alpm_list_t *alpm_list_remove_dupes(alpm { /* TODO does removing the strdup here cause invalid free's anywhere? */ alpm_list_t *lp = list, *newlist = NULL; while(lp) { - if(!alpm_list_is_in(lp->data, newlist)) { + if(!alpm_list_find(lp->data, newlist)) { newlist = alpm_list_add(newlist, lp->data); } lp = lp->next; @@ -426,7 +426,7 @@ int alpm_list_count(const alpm_list_t *l * @param haystack the list to search * @return 1 if `needle` is found, 0 otherwise */ -int alpm_list_is_in(const void *needle, alpm_list_t *haystack) +int alpm_list_find(const void *needle, alpm_list_t *haystack) { alpm_list_t *lp = haystack; while(lp) { @@ -440,12 +440,12 @@ int alpm_list_is_in(const void *needle, /* Test for existence of a string in a alpm_list_t */ -/** Is a _string_ in the list (optimization of alpm_list_is_in for strings) +/** Is a _string_ in the list (optimization of alpm_list_find for strings) * @param needle the string to compare * @param haystack the list to search * @return 1 if `needle` is found, 0 otherwise */ -int alpm_list_is_strin(const char *needle, alpm_list_t *haystack) +int alpm_list_find_str(const char *needle, alpm_list_t *haystack) { alpm_list_t *lp = haystack; while(lp) { ============================================================ --- lib/libalpm/alpm_list.h 65744c2511074c24ada34e4097fe8277eb3a825d +++ lib/libalpm/alpm_list.h bfc3b1109168fee870d57acb4e61dfabd6af510e @@ -64,8 +64,8 @@ int alpm_list_count(const alpm_list_t *l /* misc */ int alpm_list_count(const alpm_list_t *list); -int alpm_list_is_in(const void *needle, alpm_list_t *haystack); -int alpm_list_is_strin(const char *needle, alpm_list_t *haystack); +int alpm_list_find(const void *needle, alpm_list_t *haystack); +int alpm_list_find_str(const char *needle, alpm_list_t *haystack); #endif /* _ALPM_LIST_H */ ============================================================ --- lib/libalpm/cache.c cf0de6656dad87fe422f0c3ae6ea89b1e6faff06 +++ lib/libalpm/cache.c 0fadc44e68b0a673866c62d25a24564374fc0547 @@ -202,7 +202,7 @@ int _alpm_db_load_grpcache(pmdb_t *db) pmpkg_t *pkg = lp->data; for(i = pkg->groups; i; i = i->next) { - if(!alpm_list_is_strin(i->data, db->grpcache)) { + if(!alpm_list_find_str(i->data, db->grpcache)) { pmgrp_t *grp = _alpm_grp_new(); STRNCPY(grp->name, (char *)i->data, GRP_NAME_LEN); @@ -215,7 +215,7 @@ int _alpm_db_load_grpcache(pmdb_t *db) pmgrp_t *grp = j->data; if(strcmp(grp->name, i->data) == 0) { - if(!alpm_list_is_strin(pkg->name, grp->packages)) { + if(!alpm_list_find_str(pkg->name, grp->packages)) { grp->packages = alpm_list_add_sorted(grp->packages, (char *)pkg->name, _alpm_grp_cmp); } } ============================================================ --- lib/libalpm/conflict.c d366da1dc21fb6f26a4cceb654ef96afe39af3f2 +++ lib/libalpm/conflict.c 66e83be4095176722b4963146f811e99d948c15f @@ -240,7 +240,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmd if(strcmp(filestr, ".INSTALL") == 0) { continue; } - if(alpm_list_is_strin(filestr, p2->files)) { + if(alpm_list_find_str(filestr, p2->files)) { pmconflict_t *conflict = malloc(sizeof(pmconflict_t)); if(conflict == NULL) { _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), @@ -284,7 +284,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmd _alpm_log(PM_LOG_DEBUG, _("loading FILES info for '%s'"), dbpkg->name); _alpm_db_read(db, INFRQ_FILES, dbpkg); } - if(dbpkg && alpm_list_is_strin(j->data, dbpkg->files)) { + if(dbpkg && alpm_list_find_str(j->data, dbpkg->files)) { ok = 1; } /* Make sure that the supposedly-conflicting file is not actually just @@ -315,7 +315,7 @@ alpm_list_t *_alpm_db_find_conflicts(pmd _alpm_db_read(db, INFRQ_FILES, dbpkg2); } /* If it used to exist in there, but doesn't anymore */ - if(dbpkg2 && !alpm_list_is_strin(filestr, p1->files) && alpm_list_is_strin(filestr, dbpkg2->files)) { + if(dbpkg2 && !alpm_list_find_str(filestr, p1->files) && alpm_list_find_str(filestr, dbpkg2->files)) { ok = 1; /* Add to the "skip list" of files that we shouldn't remove during an upgrade. * ============================================================ --- lib/libalpm/deps.c a8ae50c4334acc48a98a1183ca5bcd843d83c39f +++ lib/libalpm/deps.c 24278ab90a5c00a33e1a21cb875cfbc053d2d82b @@ -363,7 +363,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t * spkg = k->data; } if(spkg) { - if(alpm_list_is_strin(tp->name, spkg->provides)) { + if(alpm_list_find_str(tp->name, spkg->provides)) { found = 1; } } @@ -549,7 +549,7 @@ int _alpm_resolvedeps(pmdb_t *local, alp /* check if one of the packages in *list already provides this dependency */ for(j = list; j && !found; j = j->next) { pmpkg_t *sp = (pmpkg_t *)j->data; - if(alpm_list_is_strin(miss->depend.name, sp->provides)) { + if(alpm_list_find_str(miss->depend.name, sp->provides)) { _alpm_log(PM_LOG_DEBUG, _("%s provides dependency %s -- skipping"), sp->name, miss->depend.name); found = 1; @@ -602,7 +602,7 @@ int _alpm_resolvedeps(pmdb_t *local, alp * something we're not supposed to. */ int usedep = 1; - if(alpm_list_is_strin(sync->name, handle->ignorepkg)) { + if(alpm_list_find_str(sync->name, handle->ignorepkg)) { pmpkg_t *dummypkg = _alpm_pkg_new(miss->target, NULL); QUESTION(trans, PM_TRANS_CONV_INSTALL_IGNOREPKG, dummypkg, sync, NULL, &usedep); FREEPKG(dummypkg); ============================================================ --- lib/libalpm/provide.c 340bf3f5bafcca439183bc8b41156f6db6c53a10 +++ lib/libalpm/provide.c 24328333cf3265338ad6783101e192f394192056 @@ -42,7 +42,7 @@ alpm_list_t *_alpm_db_whatprovides(pmdb_ for(lp = _alpm_db_get_pkgcache(db, INFRQ_DEPENDS); lp; lp = lp->next) { pmpkg_t *info = lp->data; - if(alpm_list_is_strin(package, info->provides)) { + if(alpm_list_find_str(package, info->provides)) { pkgs = alpm_list_add(pkgs, info); } } ============================================================ --- lib/libalpm/remove.c 73c2f04c80f0978d3c535c97d763dcd3e3fb6e5f +++ lib/libalpm/remove.c f84eb0ecac1032a61def4a123ef4bfcde0b5b438 @@ -78,7 +78,7 @@ int _alpm_remove_loadtarget(pmtrans_t *t } /* ignore holdpkgs on upgrade */ - if((trans == handle->trans) && alpm_list_is_strin(info->name, handle->holdpkg)) { + if((trans == handle->trans) && alpm_list_find_str(info->name, handle->holdpkg)) { int resp = 0; QUESTION(trans, PM_TRANS_CONV_REMOVE_HOLDPKG, info, NULL, NULL, &resp); if(!resp) { @@ -177,7 +177,7 @@ static void unlink_file(pmpkg_t *info, a FREE(checksum); } if ( !nb && trans->type == PM_TRANS_TYPE_UPGRADE ) { /* check noupgrade */ - if ( alpm_list_is_strin(file, handle->noupgrade) ) { + if ( alpm_list_find_str(file, handle->noupgrade) ) { nb = 1; } } ============================================================ --- lib/libalpm/server.c 86e081ac5aa03be1df09f38ade17b435ee07b588 +++ lib/libalpm/server.c f9ba2ac6efaf849f179e0c22a80004c2ab941798 @@ -137,7 +137,7 @@ int _alpm_downloadfiles_forreal(alpm_lis snprintf(realfile, PATH_MAX, "%s/%s", localpath, fn); snprintf(output, PATH_MAX, "%s/%s.part", localpath, fn); - if(alpm_list_is_strin(fn, complete)) { + if(alpm_list_find_str(fn, complete)) { continue; } ============================================================ --- lib/libalpm/sync.c a60e4ac114269308af71677a8a487542a06a4a60 +++ lib/libalpm/sync.c 97783930dcd1b6daa661c7c5f56a62a5a15522b8 @@ -143,7 +143,7 @@ static int find_replacements(pmtrans_t * pmpkg_t *lpkg = m->data; if(strcmp(k->data, lpkg->name) == 0) { _alpm_log(PM_LOG_DEBUG, _("checking replacement '%s' for package '%s'"), k->data, spkg->name); - if(alpm_list_is_strin(lpkg->name, handle->ignorepkg)) { + if(alpm_list_find_str(lpkg->name, handle->ignorepkg)) { _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)"), lpkg->name, lpkg->version, spkg->name, spkg->version); } else { @@ -241,7 +241,7 @@ int _alpm_sync_sysupgrade(pmtrans_t *tra local->name, local->version, db->treename, spkg->version); } else if(cmp == 0) { /* versions are identical */ - } else if(alpm_list_is_strin(spkg->name, handle->ignorepkg)) { + } else if(alpm_list_find_str(spkg->name, handle->ignorepkg)) { /* package should be ignored (IgnorePkg) */ _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), local->name, local->version, spkg->version); @@ -541,7 +541,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, local = _alpm_db_get_pkgfromcache(db_local, miss->depend.name); /* check if this package also "provides" the package it's conflicting with */ - if(alpm_list_is_strin(miss->depend.name, sync->pkg->provides)) { + if(alpm_list_find_str(miss->depend.name, sync->pkg->provides)) { /* so just treat it like a "replaces" item so the REQUIREDBY * fields are inherited properly. */ @@ -565,8 +565,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, /* figure out which one was requested in targets. If they both were, * then it's still an unresolvable conflict. */ - target = alpm_list_is_strin(miss->target, trans->targets); - depend = alpm_list_is_strin(miss->depend.name, trans->targets); + target = alpm_list_find_str(miss->target, trans->targets); + depend = alpm_list_find_str(miss->depend.name, trans->targets); if(depend && !target) { _alpm_log(PM_LOG_DEBUG, _("'%s' is in the target list -- keeping it"), miss->depend.name); @@ -597,7 +597,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, _alpm_log(PM_LOG_DEBUG, _("resolving package '%s' conflict"), miss->target); if(local) { int doremove = 0; - if(!alpm_list_is_strin(miss->depend.name, asked)) { + if(!alpm_list_find_str(miss->depend.name, asked)) { QUESTION(trans, PM_TRANS_CONV_CONFLICT_PKG, miss->target, miss->depend.name, NULL, &doremove); asked = alpm_list_add(asked, strdup(miss->depend.name)); if(doremove) { @@ -1026,7 +1026,7 @@ int _alpm_sync_commit(pmtrans_t *trans, pmpkg_t *old = j->data; /* merge lists */ for(k = old->requiredby; k; k = k->next) { - if(!alpm_list_is_strin(k->data, new->requiredby)) { + if(!alpm_list_find_str(k->data, new->requiredby)) { /* replace old's name with new's name in the requiredby's dependency list */ alpm_list_t *m; pmpkg_t *depender = _alpm_db_get_pkgfromcache(db_local, k->data); ============================================================ --- lib/libalpm/trans.c 34f23365edf1db0a0aa8bd4bf95cb15796f61a1b +++ lib/libalpm/trans.c 443b29376093a471a6bfe9e5051e0f4ace63aa9e @@ -116,7 +116,7 @@ int _alpm_trans_addtarget(pmtrans_t *tra ASSERT(trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1)); ASSERT(target != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); - if(alpm_list_is_strin(target, trans->targets)) { + if(alpm_list_find_str(target, trans->targets)) { RET_ERR(PM_ERR_TRANS_DUP_TARGET, -1); } ============================================================ --- lib/libalpm/versioncmp.c 582ae9673c26f5d6a2fcd94448abecfa769796a5 +++ lib/libalpm/versioncmp.c 03cc3c0c3845fa1efabdea7c295af687701ea508 @@ -247,7 +247,7 @@ int _alpm_depcmp(pmpkg_t *pkg, pmdepend_ { int equal = 0; - if(strcmp(pkg->name, dep->name) == 0 || alpm_list_is_strin(dep->name, pkg->provides)) { + if(strcmp(pkg->name, dep->name) == 0 || alpm_list_find_str(dep->name, pkg->provides)) { if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else { ============================================================ --- src/pacman/sync.c b390058b1dd027e02247832600d7ff544e8c5174 +++ src/pacman/sync.c 1700c5913b3911c286546326e7898cb0f9abe6fa @@ -159,7 +159,7 @@ static int sync_cleancache(int level) /* TODO Do not remove the currently installed version EITHER */ if(!strcmp(name, n)) { char *ptr = (alpm_pkg_vercmp(version, v) < 0) ? str : s; - if(!alpm_list_is_strin(ptr, clean)) { + if(!alpm_list_find_str(ptr, clean)) { clean = alpm_list_add(clean, strdup(ptr)); } } @@ -644,7 +644,7 @@ int pacman_sync(alpm_list_t *targets) for(j = data; j; j = alpm_list_next(j)) { pmpkg_t *p = alpm_list_getdata(j); const char *pkgname = alpm_pkg_get_name(p); - if(!alpm_list_is_strin(pkgname, list_remove)) { + if(!alpm_list_find_str(pkgname, list_remove)) { list_remove = alpm_list_add(list_remove, strdup(pkgname)); } }

2 4

[pacman-dev] [patch] Modified info query so unknown attributes are not shown
by Dan McGee 27 Jan '07

27 Jan '07

(Patched on my local tree, so it may not line up perfectly, but it is very straightforward.) * Modified info query so it doesn't show more than available when querying a package file. Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> # # old_revision [6ed5dfeba6a29ca2c5158f88f2d76b21fc8938f3] # # patch "src/pacman/package.c" # from [1c53121b062b4ee21f6b372e5e3ffbceb3b2b36f] # to [d935dbb664984fa0b60ea08b3132946f49be2214] # ============================================================ --- src/pacman/package.c 1c53121b062b4ee21f6b372e5e3ffbceb3b2b36f +++ src/pacman/package.c d935dbb664984fa0b60ea08b3132946f49be2214 @@ -34,6 +34,10 @@ #include "package.h" /* Display the content of an installed package + * + * level: <1 - omits N/A info for file query (-Qp) + * 1 - normal level + * >1 - extra information (backup files) */ void dump_pkg_full(pmpkg_t *pkg, int level) { @@ -69,26 +73,26 @@ void dump_pkg_full(pmpkg_t *pkg, int lev list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - /* TODO only applicable if querying installed package, not a file */ - list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + if(level > 0) { /* Only applicable if installed package */ + list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + } list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); - /* TODO only applicable if querying installed package, not a file */ - printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + if(level > 0) { + printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); + printf(_("Install Reason : %s\n"), reason); + } printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); - printf(_("Reason : %s\n"), reason); - /* TODO only applicable if querying installed package, not a file */ printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); printf("\n"); /* Print additional package info if info flag passed more than once */ - /* TODO only applicable if querying installed package, not a file */ if(level > 1) { /* call new backup function */ dump_pkg_backups(pkg);

1 0

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

26 Jan '07

Date: Thursday, January 25, 2007 @ 21:19:24 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: downloadprog.c (1.7 -> 1.8) Missed that 8) ----------------+ downloadprog.c | 1 - 1 file changed, 1 deletion(-) Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.7 pacman-lib/src/pacman/downloadprog.c:1.8 --- pacman-lib/src/pacman/downloadprog.c:1.7 Thu Jan 25 21:13:16 2007 +++ pacman-lib/src/pacman/downloadprog.c Thu Jan 25 21:19:24 2007 @@ -56,7 +56,6 @@ /* a little hard to conceal easter eggs in open-source software, * but they're still fun. ;) */ const unsigned short chomp = alpm_option_get_chomp(); - unsigned int chomp = 0; char *fname, *p; unsigned int maxcols = getcols(); unsigned int progresslen = maxcols - 57;

1 0

[pacman-dev] CVS update of pacman-lib (13 files)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 21:13:17 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: autoclean.sh (1.7 -> 1.8) configure.ac (1.22 -> 1.23) etc/pacman.d/Makefile.am (1.3 -> 1.4) lib/libalpm/Makefile.am (1.13 -> 1.14) lib/libalpm/alpm.c (1.105 -> 1.106) lib/libalpm/deps.c (1.58 -> 1.59) scripts/makeworld (1.5 -> 1.6) src/pacman/Makefile.am (1.11 -> 1.12) src/pacman/downloadprog.c (1.6 -> 1.7) src/pacman/package.c (1.23 -> 1.24) src/pacman/pacman.c (1.83 -> 1.84) src/pacman/trans.h (1.6 -> 1.7) src/pacman/util.c (1.23 -> 1.24) Dan McGee <dpmcgee(a)gmail.com> * Lots of code cleanup, and type fixes * Make 'makeworld' a bit more in-line with the other stuff * Make -Si and -Qi operations appear the same ---------------------------+ autoclean.sh | 1 + configure.ac | 26 ++++++++++---------------- etc/pacman.d/Makefile.am | 1 - lib/libalpm/Makefile.am | 2 +- lib/libalpm/alpm.c | 4 ++-- lib/libalpm/deps.c | 4 ++-- scripts/makeworld | 12 ++++++------ src/pacman/Makefile.am | 4 ++-- src/pacman/downloadprog.c | 6 +++--- src/pacman/package.c | 22 +++++++++++----------- src/pacman/pacman.c | 4 ++-- src/pacman/trans.h | 1 + src/pacman/util.c | 2 +- 13 files changed, 42 insertions(+), 47 deletions(-) Index: pacman-lib/autoclean.sh diff -u pacman-lib/autoclean.sh:1.7 pacman-lib/autoclean.sh:1.8 --- pacman-lib/autoclean.sh:1.7 Tue Dec 19 02:58:29 2006 +++ pacman-lib/autoclean.sh Thu Jan 25 21:13:16 2007 @@ -36,6 +36,7 @@ rm -rf etc/Makefile rm -rf etc/pacman.d/Makefile.in rm -rf etc/pacman.d/Makefile +rm -rf etc/pacman.d/{current,extra,community,unstable,release} rm -rf etc/abs/Makefile.in rm -rf etc/abs/Makefile Index: pacman-lib/configure.ac diff -u pacman-lib/configure.ac:1.22 pacman-lib/configure.ac:1.23 --- pacman-lib/configure.ac:1.22 Thu Jan 11 12:34:51 2007 +++ pacman-lib/configure.ac Thu Jan 25 21:13:16 2007 @@ -147,7 +147,7 @@ dnl Help line for debug AC_ARG_ENABLE(debug, - AC_HELP_STRING([ --enable-debug], [Enable debugging support]), + AC_HELP_STRING([--enable-debug], [Enable debugging support]), [debug=$enableval], [debug=yes]) dnl Help line for fakeroot @@ -292,26 +292,20 @@ fi dnl Check for math -AC_CHECK_LIB([m], [log10], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) -if test -n "$LIBM"; then - LDFLAGS="$LDFLAGS $LIBM" -else - AC_MSG_ERROR("math library not found!"); +AC_CHECK_LIB([m], [sqrt], [AC_CHECK_HEADER([math.h], [LIBM='-lm'])]) +if test -z "$LIBM"; then + AC_MSG_ERROR("math library needed to compile pacman!"); fi dnl Check for libarchive AC_CHECK_LIB([archive], [archive_read_data], [AC_CHECK_HEADER([archive.h], [LIBARCHIVE='-larchive'])]) -if test -n "$LIBARCHIVE"; then - LDFLAGS="$LDFLAGS $LIBARCHIVE" -else +if test -z "$LIBARCHIVE"; then AC_MSG_ERROR("libarchive is needed to compile pacman!"); fi dnl Check for libdownload AC_CHECK_LIB([download], [downloadParseURL], [AC_CHECK_HEADER([download.h], [LIBDOWNLOAD='-ldownload'])]) -if test -n "$LIBDOWNLOAD"; then - LDFLAGS="$LDFLAGS $LIBDOWNLOAD" -else +if test -z "$LIBDOWNLOAD"; then AC_MSG_ERROR("libdownload is needed to compile pacman!"); fi @@ -326,20 +320,20 @@ dnl Enable or disable debug code AC_MSG_CHECKING(for debug mode request) -if test x$debug = xyes ; then - AM_CONDITIONAL(PACMAN_DEBUG, test x$debug = xyes) +if test "$debug" = "yes" ; then + AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "yes") CFLAGS="$CFLAGS -g -Wall -Werror -std=c99 -DPACMAN_DEBUG" LDFLAGS="$LDFLAGS -lmcheck" AC_MSG_RESULT(yes) else - AM_CONDITIONAL(PACMAN_DEBUG, test x$debug = xno) + AM_CONDITIONAL(PACMAN_DEBUG, test "$debug" = "no") CFLAGS="$CFLAGS -Wall -std=c99" AC_MSG_RESULT(no) fi dnl Enable or disable fakeroot code AC_MSG_CHECKING(for fakeroot proof support) -if test x$fakeroot = xyes ; then +if test "$fakeroot" = "yes" ; then AC_MSG_RESULT(yes) else CFLAGS="$CFLAGS -DFAKEROOT" Index: pacman-lib/etc/pacman.d/Makefile.am diff -u pacman-lib/etc/pacman.d/Makefile.am:1.3 pacman-lib/etc/pacman.d/Makefile.am:1.4 --- pacman-lib/etc/pacman.d/Makefile.am:1.3 Tue Jan 16 22:40:09 2007 +++ pacman-lib/etc/pacman.d/Makefile.am Thu Jan 25 21:13:16 2007 @@ -1,7 +1,6 @@ EXTRA_DIST = community current extra release unstable clean: - rm $(EXTRA_DIST) install-data-hook: mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \ Index: pacman-lib/lib/libalpm/Makefile.am diff -u pacman-lib/lib/libalpm/Makefile.am:1.13 pacman-lib/lib/libalpm/Makefile.am:1.14 --- pacman-lib/lib/libalpm/Makefile.am:1.13 Fri Jan 19 04:28:44 2007 +++ pacman-lib/lib/libalpm/Makefile.am Thu Jan 25 21:13:16 2007 @@ -40,7 +40,7 @@ libalpm_la_SOURCES = $(TARGETS) libalpm_la_LDFLAGS = -no-undefined -version-info $(PM_VERSION_INFO) -libalpm_la_LIBADD = -larchive -ldownload +libalpm_la_LIBADD = -larchive -ldownload -lm if HAS_DOXYGEN all: doxygen.in Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.105 pacman-lib/lib/libalpm/alpm.c:1.106 --- pacman-lib/lib/libalpm/alpm.c:1.105 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/alpm.c Thu Jan 25 21:13:16 2007 @@ -566,7 +566,7 @@ * and * package-name-bar-1.2.3-1 */ - int i = 0; + size_t i = 0; char *arch, *cmp, *p; if((p = strrchr(pkgname, '-'))) { @@ -1008,7 +1008,7 @@ _alpm_log(PM_LOG_DEBUG, _("config: xfercommand: %s"), ptr); } else if (!strcmp(key, "UPGRADEDELAY")) { /* The config value is in days, we use seconds */ - long ud = atol(ptr) * 60 * 60 *24; + time_t ud = atol(ptr) * 60 * 60 *24; alpm_option_set_upgradedelay(ud); _alpm_log(PM_LOG_DEBUG, _("config: upgradedelay: %d"), ud); } else { Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.58 pacman-lib/lib/libalpm/deps.c:1.59 --- pacman-lib/lib/libalpm/deps.c:1.58 Tue Jan 23 22:02:54 2007 +++ pacman-lib/lib/libalpm/deps.c Thu Jan 25 21:13:16 2007 @@ -249,9 +249,9 @@ } if(!_alpm_depcmp(tp, &depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"), - depend.name, p->name); + depend.name, p->name); miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, - depend.name, depend.version); + depend.name, depend.version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { Index: pacman-lib/scripts/makeworld diff -u pacman-lib/scripts/makeworld:1.5 pacman-lib/scripts/makeworld:1.6 --- pacman-lib/scripts/makeworld:1.5 Wed Dec 20 20:53:41 2006 +++ pacman-lib/scripts/makeworld Thu Jan 25 21:13:16 2007 @@ -20,8 +20,8 @@ # USA. # -version="2.9.8" -toplevel=`pwd` +version="3.0.0" +toplevel=$(pwd) usage() { echo "makeworld version $version" @@ -119,13 +119,13 @@ # convert a (possibly) relative path to absolute cd $dest -dest=`pwd` +dest=$(pwd) cd - &>/dev/null -sd=`date +"[%b %d %H:%M]"` +sd=$(date +"[%b %d %H:%M]") for category in $*; do - for port in `find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort`; do + for port in $(find $toplevel/$category -maxdepth 1 -mindepth 1 -type d | sort); do cd $port if [ -f PKGBUILD ]; then . PKGBUILD @@ -138,7 +138,7 @@ buildstatus=1 fi fi - d=`date +"[%b %d %H:%M]"` + d=$(date +"[%b %d %H:%M]") echo -n "$d " >>$toplevel/build.log case $buildstatus in 0) echo "$pkgname already built -- skipping" >>$toplevel/build.log ;; Index: pacman-lib/src/pacman/Makefile.am diff -u pacman-lib/src/pacman/Makefile.am:1.11 pacman-lib/src/pacman/Makefile.am:1.12 --- pacman-lib/src/pacman/Makefile.am:1.11 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/Makefile.am Thu Jan 25 21:13:16 2007 @@ -17,9 +17,9 @@ pacman_static_SOURCES = $(pacman_SOURCES) pacman_LDADD = -L$(top_srcdir)/lib/libalpm/.libs \ - -ldownload -lm -lalpm + -ldownload -lalpm pacman_static_LDADD = -L$(top_srcdir)/lib/libalpm/.libs/ \ - -ldownload -lm -lalpm + -ldownload -lalpm pacman_static_LDFLAGS = $(LDFLAGS) -all-static Index: pacman-lib/src/pacman/downloadprog.c diff -u pacman-lib/src/pacman/downloadprog.c:1.6 pacman-lib/src/pacman/downloadprog.c:1.7 --- pacman-lib/src/pacman/downloadprog.c:1.6 Fri Jan 19 04:28:46 2007 +++ pacman-lib/src/pacman/downloadprog.c Thu Jan 25 21:13:16 2007 @@ -53,6 +53,9 @@ { static unsigned int lasthash = 0, mouth = 0; unsigned int i, hash; + /* a little hard to conceal easter eggs in open-source software, + * but they're still fun. ;) */ + const unsigned short chomp = alpm_option_get_chomp(); unsigned int chomp = 0; char *fname, *p; unsigned int maxcols = getcols(); @@ -75,9 +78,6 @@ return; } - /* a little hard to conceal easter eggs in open-source software, but they're still fun. ;) */ - chomp = alpm_option_get_chomp(); - gettimeofday(&current_time, NULL); total_timediff = current_time.tv_sec-initial_time.tv_sec + (float)(current_time.tv_usec-initial_time.tv_usec) / 1000000; Index: pacman-lib/src/pacman/package.c diff -u pacman-lib/src/pacman/package.c:1.23 pacman-lib/src/pacman/package.c:1.24 --- pacman-lib/src/pacman/package.c:1.23 Mon Jan 22 03:52:18 2007 +++ pacman-lib/src/pacman/package.c Thu Jan 25 21:13:16 2007 @@ -63,24 +63,24 @@ /* actual output */ printf(_("Name : %s\n"), (char *)alpm_pkg_get_name(pkg)); printf(_("Version : %s\n"), (char *)alpm_pkg_get_version(pkg)); - list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); - printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("URL : %s\n"), (char *)alpm_pkg_get_url(pkg)); list_display(_("License :"), alpm_pkg_get_licenses(pkg)); + list_display(_("Groups :"), alpm_pkg_get_groups(pkg)); + list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); + list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); + list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); + /* TODO only applicable if querying installed package, not a file */ + list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); + list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); + printf(_("Installed Size : %ld K\n"), (long)alpm_pkg_get_size(pkg) / 1024); + printf(_("Packager : %s\n"), (char *)alpm_pkg_get_packager(pkg)); printf(_("Architecture : %s\n"), (char *)alpm_pkg_get_arch(pkg)); - printf(_("Installed Size : %ld\n"), (long int)alpm_pkg_get_size(pkg)); printf(_("Build Date : %s %s\n"), bdate, strlen(bdate) ? "UTC" : ""); printf(_("Build Type : %s\n"), strlen(type) ? type : _("Unknown")); /* TODO only applicable if querying installed package, not a file */ printf(_("Install Date : %s %s\n"), idate, strlen(idate) ? "UTC" : ""); printf(_("Install Script : %s\n"), alpm_pkg_has_scriptlet(pkg) ? _("Yes") : _("No")); printf(_("Reason : %s\n"), reason); - list_display(_("Provides :"), alpm_pkg_get_provides(pkg)); - list_display(_("Depends On :"), alpm_pkg_get_depends(pkg)); - list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); - /* TODO only applicable if querying installed package, not a file */ - list_display(_("Required By :"), alpm_pkg_get_requiredby(pkg)); - list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); @@ -117,8 +117,8 @@ list_display(_("Removes :"), alpm_pkg_get_removes(pkg)); list_display(_("Conflicts With :"), alpm_pkg_get_conflicts(pkg)); list_display(_("Replaces :"), alpm_pkg_get_replaces(pkg)); - printf(_("Download Size : %ld\n"), (long)alpm_pkg_get_size(pkg)); - printf(_("Installed Size : %ld\n"), (long)alpm_pkg_get_isize(pkg)); + printf(_("Download Size : %6.2f K\n"), (float)alpm_pkg_get_size(pkg) / 1024.0); + printf(_("Installed Size : %6.2f K\n"), (float)alpm_pkg_get_isize(pkg) / 1024.0); printf(_("Description : ")); indentprint(alpm_pkg_get_desc(pkg), 17); Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.83 pacman-lib/src/pacman/pacman.c:1.84 --- pacman-lib/src/pacman/pacman.c:1.83 Wed Jan 24 11:57:19 2007 +++ pacman-lib/src/pacman/pacman.c Thu Jan 25 21:13:16 2007 @@ -121,8 +121,8 @@ printf(_("usage: %s {-Q --query} [options] [package]\n"), myname); printf(_("options:\n")); printf(_(" -c, --changelog view the changelog of a package\n")); - printf(_(" -e, --orphans list all packages that were installed as a dependency\n")); - printf(_(" and are not required by any other packages\n")); + printf(_(" -e, --orphans list all packages installed as dependencies but no longer\n")); + printf(_(" required by any package\n")); printf(_(" -g, --groups view all members of a package group\n")); printf(_(" -i, --info view package information\n")); printf(_(" -l, --list list the contents of the queried package\n")); Index: pacman-lib/src/pacman/trans.h diff -u pacman-lib/src/pacman/trans.h:1.6 pacman-lib/src/pacman/trans.h:1.7 --- pacman-lib/src/pacman/trans.h:1.6 Tue Jan 23 22:02:55 2007 +++ pacman-lib/src/pacman/trans.h Thu Jan 25 21:13:16 2007 @@ -28,6 +28,7 @@ void cb_trans_conv(pmtransconv_t event, void *data1, void *data2, 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); Index: pacman-lib/src/pacman/util.c diff -u pacman-lib/src/pacman/util.c:1.23 pacman-lib/src/pacman/util.c:1.24 --- pacman-lib/src/pacman/util.c:1.23 Wed Jan 24 11:57:19 2007 +++ pacman-lib/src/pacman/util.c Thu Jan 25 21:13:16 2007 @@ -167,7 +167,7 @@ while(*p) { if(*p == ' ') { const char *next = NULL; - int len; + unsigned int len; p++; if(p == NULL || *p == ' ') continue; next = strchr(p, ' ');

1 0

[pacman-dev] CVS update of pacman-lib/doc (pacman.8.in)
by Aaron Griffin 26 Jan '07

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:57:06 Author: aaron Path: /home/cvs-pacman/pacman-lib/doc Modified: pacman.8.in (1.9 -> 1.10) Forgot this patch from Dan McGee as part of the bug #5409 fixes -------------+ pacman.8.in | 3 +++ 1 file changed, 3 insertions(+) Index: pacman-lib/doc/pacman.8.in diff -u pacman-lib/doc/pacman.8.in:1.9 pacman-lib/doc/pacman.8.in:1.10 --- pacman-lib/doc/pacman.8.in:1.9 Tue Dec 5 02:38:34 2006 +++ pacman-lib/doc/pacman.8.in Thu Jan 25 20:57:06 2007 @@ -305,6 +305,9 @@ follow a URL naming structure. Currently only ftp is supported for remote servers. If you want to use a local directory, you can specify the full path with a 'file://' prefix, as shown above. +The order of repositories in the file matters; repositories listed first will +take precidence over those listed later in the file when packages in two +repositories have identical names, regardless of version number. .SH USING YOUR OWN REPOSITORY Let's say you have a bunch of custom packages in \fI/home/pkgs\fP and their respective PKGBUILD files are all in \fI/var/abs/local\fP. All you need to do is generate a compressed package database

1 0

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

26 Jan '07

Date: Thursday, January 25, 2007 @ 20:34:27 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/pacman Modified: trans.c (1.28 -> 1.29) * copy and paste error, "resolving deps" -> "cleaning up" Signed-off-by: Dan McGee <dpmcgee(a)gmail.com> ---------+ trans.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.28 pacman-lib/src/pacman/trans.c:1.29 --- pacman-lib/src/pacman/trans.c:1.28 Tue Jan 23 22:02:55 2007 +++ pacman-lib/src/pacman/trans.c Thu Jan 25 20:34:26 2007 @@ -60,7 +60,7 @@ } break; case PM_TRANS_EVT_CLEANUP_START: - pm_fprintf(stderr, NL, _("resolving dependencies... ")); + pm_fprintf(stderr, NL, _("cleaning up... ")); break; case PM_TRANS_EVT_RESOLVEDEPS_START: pm_fprintf(stderr, NL, _("resolving dependencies... "));

1 0