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

[pacman-dev] no more NoUpgrade lines from pacman.conf!
by Roman Kyrylych 04 Mar '07

04 Mar '07

2007/3/4, Aaron Griffin <aaron(a)archlinux.org>: > Date: Sunday, March 4, 2007 @ 01:28:49 > * Removed NoUpgrade lines from pacman.conf - we need to test this! Finally! Besides that bug when file is overwritten first time after removing from NoUpgrade (which was fixed recently with proactive backup handling) I didn't see any issues. I don't use NoUpgrade since pacman 2.9.8. Can we (do we?) have some pactests for this? -- Roman Kyrylych (Роман Кирилич)

1 0

[pacman-dev] CVS update of pacman-lib (lib/libalpm/handle.c src/pacman/pacman.c)
by Aaron Griffin 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 04:16:29 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/handle.c (1.35 -> 1.36) src/pacman/pacman.c (1.102 -> 1.103) * Fixed the handle realroot stuff * Added some {} ----------------------+ lib/libalpm/handle.c | 10 ++++++---- src/pacman/pacman.c | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.35 pacman-lib/lib/libalpm/handle.c:1.36 --- pacman-lib/lib/libalpm/handle.c:1.35 Sun Mar 4 04:08:55 2007 +++ pacman-lib/lib/libalpm/handle.c Sun Mar 4 04:16:28 2007 @@ -155,13 +155,13 @@ /* According to the man page, realpath is safe to use IFF the second arg is * NULL. */ char *realroot = realpath(root, NULL); - if(!realroot) { - realroot = root; + if(realroot) { + root = realroot; + } else { _alpm_log(PM_LOG_ERROR, _("cannot canonicalize specified root path '%s'"), root); } - /* check again, in case both are null */ - if(realroot) { + if(root) { /* verify root ends in a '/' */ int rootlen = strlen(realroot); if(realroot[rootlen-1] != '/') { @@ -172,6 +172,8 @@ handle->root[rootlen-1] = '/'; _alpm_log(PM_LOG_DEBUG, _("option 'root' = %s"), handle->root); + } + if(realroot) { free(realroot); } } Index: pacman-lib/src/pacman/pacman.c diff -u pacman-lib/src/pacman/pacman.c:1.102 pacman-lib/src/pacman/pacman.c:1.103 --- pacman-lib/src/pacman/pacman.c:1.102 Mon Feb 26 03:43:02 2007 +++ pacman-lib/src/pacman/pacman.c Sun Mar 4 04:16:28 2007 @@ -434,8 +434,9 @@ } /* workaround for tr_TR */ - if(lang && !strcmp(lang, "tr_TR")) + if(lang && !strcmp(lang, "tr_TR")) { setlocale(LC_CTYPE, "C"); + } bindtextdomain("pacman", "/usr/share/locale"); textdomain("pacman");

1 0

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

04 Mar '07

Date: Sunday, March 4, 2007 @ 04:08:55 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.123 -> 1.124) alpm.c (1.122 -> 1.123) be_files.c (1.34 -> 1.35) db.c (1.64 -> 1.65) handle.c (1.34 -> 1.35) md5driver.c (1.5 -> 1.6) sha1.c (1.4 -> 1.5) sync.c (1.108 -> 1.109) util.c (1.47 -> 1.48) * Fixed a whole mess of extra '/' pathing issues when a different root is specified * Use db->path when appropriate * Commented out the FAKEROOT checks in libalpm. This should never ever be done. TODO test this quite a bit, as this will never cause the transactions to fail if RW operations are requested... right now it is totally up to the front end to decide when to fail * Use realpath() to canonicalize the root path when specified, so _alpm_makepath() doesn't freak out * Fixed some output/indent of MDFile and SHAFile algorithms * More efficient sprintf() usage in MDFile/SHAFile * Added real error output to _alpm_makepath -------------+ add.c | 2 +- alpm.c | 4 ++-- be_files.c | 4 ++-- db.c | 2 +- handle.c | 57 ++++++++++++++++++++++++++++++++++----------------------- md5driver.c | 20 ++++---------------- sha1.c | 51 +++++++++++++++++++++++++-------------------------- sync.c | 11 ++++++----- util.c | 2 ++ 9 files changed, 77 insertions(+), 76 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.123 pacman-lib/lib/libalpm/add.c:1.124 --- pacman-lib/lib/libalpm/add.c:1.123 Sat Mar 3 15:22:48 2007 +++ pacman-lib/lib/libalpm/add.c Sun Mar 4 04:08:54 2007 @@ -816,7 +816,7 @@ /* run the post-install script if it exists */ if(alpm_pkg_has_scriptlet(newpkg) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { char pm_install[PATH_MAX]; - snprintf(pm_install, PATH_MAX, "%s%s/%s/%s-%s/install", handle->root, handle->dbpath, db->treename, + snprintf(pm_install, PATH_MAX, "%s%s%s-%s/install", handle->root, db->path, alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg)); if(is_upgrade) { _alpm_runscriptlet(handle->root, pm_install, "post_upgrade", Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.122 pacman-lib/lib/libalpm/alpm.c:1.123 --- pacman-lib/lib/libalpm/alpm.c:1.122 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/alpm.c Sun Mar 4 04:08:54 2007 @@ -299,10 +299,10 @@ _alpm_log(PM_LOG_DEBUG, _("sync: new mtime for %s: %s"), db->treename, newmtime); _alpm_db_setlastupdate(db, newmtime); } - snprintf(path, PATH_MAX, "%s%s/%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); + snprintf(path, PATH_MAX, "%s%s%s" PM_EXT_DB, handle->root, handle->dbpath, db->treename); /* remove the old dir */ - _alpm_log(PM_LOG_DEBUG, _("flushing database %s%s"), handle->dbpath, db->treename); + _alpm_log(PM_LOG_DEBUG, _("flushing database %s%s"), db->path); for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) { pmpkg_t *pkg = lp->data; if(pkg && _alpm_db_remove(db, pkg) == -1) { Index: pacman-lib/lib/libalpm/be_files.c diff -u pacman-lib/lib/libalpm/be_files.c:1.34 pacman-lib/lib/libalpm/be_files.c:1.35 --- pacman-lib/lib/libalpm/be_files.c:1.34 Sun Mar 4 01:28:48 2007 +++ pacman-lib/lib/libalpm/be_files.c Sun Mar 4 04:08:54 2007 @@ -717,7 +717,7 @@ return(-1); } - snprintf(file, PATH_MAX, "%s%s/%s/.lastupdate", handle->root, handle->dbpath, db->treename); + snprintf(file, PATH_MAX, "%s%s.lastupdate", handle->root, db->path); /* get the last update time, if it's there */ if((fp = fopen(file, "r")) == NULL) { @@ -749,7 +749,7 @@ return(-1); } - snprintf(file, PATH_MAX, "%s%s/%s/.lastupdate", handle->root, handle->dbpath, db->treename); + snprintf(file, PATH_MAX, "%s%s.lastupdate", handle->root, db->path); if((fp = fopen(file, "w")) == NULL) { return(-1); Index: pacman-lib/lib/libalpm/db.c diff -u pacman-lib/lib/libalpm/db.c:1.64 pacman-lib/lib/libalpm/db.c:1.65 --- pacman-lib/lib/libalpm/db.c:1.64 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/db.c Sun Mar 4 04:08:54 2007 @@ -181,7 +181,7 @@ /* make sure the database directory exists */ snprintf(path, PATH_MAX, "%s%s/%s", handle->root, handle->dbpath, treename); if(stat(path, &buf) != 0 || !S_ISDIR(buf.st_mode)) { - _alpm_log(PM_LOG_DEBUG, _("database directory '%s' does not exist -- try creating it"), path); + _alpm_log(PM_LOG_ERROR, _("database directory '%s' does not exist, try creating it"), path); if(_alpm_makepath(path) != 0) { RET_ERR(PM_ERR_SYSTEM, NULL); } Index: pacman-lib/lib/libalpm/handle.c diff -u pacman-lib/lib/libalpm/handle.c:1.34 pacman-lib/lib/libalpm/handle.c:1.35 --- pacman-lib/lib/libalpm/handle.c:1.34 Sun Mar 4 01:28:48 2007 +++ pacman-lib/lib/libalpm/handle.c Sun Mar 4 04:08:55 2007 @@ -56,25 +56,25 @@ #ifndef CYGWIN /* see if we're root or not */ handle->uid = geteuid(); -#ifndef FAKEROOT - if(!handle->uid && getenv("FAKEROOTKEY")) { - /* fakeroot doesn't count, we're non-root */ - handle->uid = 99; - } -#endif - - /* 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) { -#endif - handle->access = PM_ACCESS_RW; - } else { - handle->access = PM_ACCESS_RO; - } -#else +//#ifndef FAKEROOT +// if(!handle->uid && getenv("FAKEROOTKEY")) { +// /* fakeroot doesn't count, we're non-root */ +// handle->uid = 99; +// } +//#endif +// +// /* 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) { +//#endif +// handle->access = PM_ACCESS_RW; +// } else { +// handle->access = PM_ACCESS_RO; +// } +//#else handle->access = PM_ACCESS_RW; #endif @@ -152,16 +152,27 @@ void alpm_option_set_root(const char *root) { if(handle->root) FREE(handle->root); - if(root) { + /* According to the man page, realpath is safe to use IFF the second arg is + * NULL. */ + char *realroot = realpath(root, NULL); + if(!realroot) { + realroot = root; + _alpm_log(PM_LOG_ERROR, _("cannot canonicalize specified root path '%s'"), root); + } + + /* check again, in case both are null */ + if(realroot) { /* verify root ends in a '/' */ - int rootlen = strlen(root); - if(root[rootlen-1] != '/') { + int rootlen = strlen(realroot); + if(realroot[rootlen-1] != '/') { rootlen += 1; } handle->root = calloc(rootlen+1, sizeof(char)); - strncpy(handle->root, root, rootlen); + strncpy(handle->root, realroot, rootlen); handle->root[rootlen-1] = '/'; _alpm_log(PM_LOG_DEBUG, _("option 'root' = %s"), handle->root); + + free(realroot); } } Index: pacman-lib/lib/libalpm/md5driver.c diff -u pacman-lib/lib/libalpm/md5driver.c:1.5 pacman-lib/lib/libalpm/md5driver.c:1.6 --- pacman-lib/lib/libalpm/md5driver.c:1.5 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/md5driver.c Sun Mar 4 04:08:55 2007 @@ -48,7 +48,7 @@ ALPM_LOG_FUNC; if((file = fopen(filename, "rb")) == NULL) { - printf (_("%s can't be opened\n"), filename); + _alpm_log(PM_LOG_ERROR, _("%s can't be opened\n"), filename); } else { char *ret; int i; @@ -59,28 +59,16 @@ } MDFinal(digest, &context); fclose(file); - /*printf("MD5 (%s) = ", filename); - MDPrint(digest); - printf("\n");*/ - ret = (char*)malloc(33); - ret[0] = '\0'; + ret = calloc(33, sizeof(char)); for(i = 0; i < 16; i++) { - sprintf(ret, "%s%02x", ret, digest[i]); + sprintf(ret+(i*2), "%02x", digest[i]); } + _alpm_log(PM_LOG_DEBUG, _("sha1(%s) = %s"), filename, ret); return(ret); } return(NULL); } -/* Prints a message digest in hexadecimal. - */ -void _alpm_MDPrint(unsigned char digest[16]) -{ - unsigned int i; - for (i = 0; i < 16; i++) - printf ("%02x", digest[i]); -} - /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/sha1.c diff -u pacman-lib/lib/libalpm/sha1.c:1.4 pacman-lib/lib/libalpm/sha1.c:1.5 --- pacman-lib/lib/libalpm/sha1.c:1.4 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/sha1.c Sun Mar 4 04:08:55 2007 @@ -386,35 +386,34 @@ char* _alpm_SHAFile(char *filename) { - FILE *file; - struct sha_ctx context; - int len, i; - unsigned char buffer[1024], digest[20]; - char *ret; - - ALPM_LOG_FUNC; + FILE *file; + struct sha_ctx context; + int len, i; + unsigned char buffer[1024], digest[20]; + char *ret; - if((file = fopen(filename, "rb")) == NULL) { - fprintf(stderr, _("%s can't be opened\n"), filename); - } else { - sha_init_ctx(&context); - while((len = fread(buffer, 1, 1024, file))) { - sha_process_bytes(buffer, len, &context); - } - sha_finish_ctx(&context, digest); - fclose(file); -#ifdef DEBUG - SHAPrint(digest); -#endif - ret = (char*)malloc(41); - ret[0] = '\0'; - for(i = 0; i < 20; i++) { - sprintf(ret, "%s%02x", ret, digest[i]); + ALPM_LOG_FUNC; + + if((file = fopen(filename, "rb")) == NULL) { + _alpm_log(PM_LOG_ERROR, _("sha1: %s can't be opened\n"), filename); + } else { + sha_init_ctx(&context); + while((len = fread(buffer, 1, 1024, file))) { + sha_process_bytes(buffer, len, &context); + } + sha_finish_ctx(&context, digest); + fclose(file); + + ret = (char*)malloc(41); + ret[0] = '\0'; + for(i = 0; i < 20; i++) { + sprintf(ret+(i*2), "%02x", digest[i]); + } + _alpm_log(PM_LOG_DEBUG, _("sha1(%s) = %s"), filename, ret); + return(ret); } - return(ret); - } - return(NULL); + return(NULL); } /* vim: set ts=2 sw=2 noet: */ Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.108 pacman-lib/lib/libalpm/sync.c:1.109 --- pacman-lib/lib/libalpm/sync.c:1.108 Sat Mar 3 20:22:57 2007 +++ pacman-lib/lib/libalpm/sync.c Sun Mar 4 04:08:55 2007 @@ -800,8 +800,8 @@ EVENT(trans, PM_TRANS_EVT_RETRIEVE_START, current->treename, NULL); if(stat(ldir, &buf)) { /* no cache directory.... try creating it */ - _alpm_log(PM_LOG_WARNING, _("no %s cache exists. creating...\n"), ldir); - alpm_logaction(_("warning: no %s cache exists. creating..."), ldir); + _alpm_log(PM_LOG_WARNING, _("no %s cache exists, creating...\n"), ldir); + alpm_logaction(_("warning: no %s cache exists, creating..."), ldir); if(_alpm_makepath(ldir)) { /* couldn't mkdir the cache directory, so fall back to /tmp and unlink * the package afterwards. @@ -840,6 +840,7 @@ sha1sum1 = spkg->sha1sum; if((md5sum1 == NULL) && (sha1sum1 == NULL)) { + /* TODO wtf is this? malloc'd strings for error messages? */ if((ptr = (char *)malloc(512)) == NULL) { RET_ERR(PM_ERR_MEMORY, -1); } @@ -848,7 +849,7 @@ retval = 1; continue; } - snprintf(str, PATH_MAX, "%s/%s/%s", handle->root, handle->cachedir, pkgname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, pkgname); md5sum2 = _alpm_MDFile(str); sha1sum2 = _alpm_SHAFile(str); if(md5sum2 == NULL && sha1sum2 == NULL) { @@ -872,7 +873,7 @@ } if(doremove) { char str[PATH_MAX]; - snprintf(str, PATH_MAX, "%s%s/%s", handle->root, handle->cachedir, pkgname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, pkgname); unlink(str); snprintf(ptr, 512, _("archive %s was corrupted (bad MD5 or SHA1 checksum)\n"), pkgname); } else { @@ -957,7 +958,7 @@ char str[PATH_MAX]; fname = alpm_pkg_get_filename(spkg); - snprintf(str, PATH_MAX, "%s%s/%s", handle->root, handle->cachedir, fname); + snprintf(str, PATH_MAX, "%s%s%s", handle->root, handle->cachedir, fname); if(_alpm_trans_addtarget(tr, str) == -1) { goto error; } Index: pacman-lib/lib/libalpm/util.c diff -u pacman-lib/lib/libalpm/util.c:1.47 pacman-lib/lib/libalpm/util.c:1.48 --- pacman-lib/lib/libalpm/util.c:1.47 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/util.c Sun Mar 4 04:08:55 2007 @@ -139,6 +139,8 @@ if(mkdir(full, 0755)) { FREE(orig); umask(oldmask); + _alpm_log(PM_LOG_ERROR, _("failed to make path '%s' : %s"), + path, strerror(errno)); return(1); } }

1 0

[pacman-dev] CVS update of pacman-lib (16 files)
by Aaron Griffin 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 01:28:49 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: etc/pacman.conf.in (1.5 -> 1.6) lib/libalpm/be_files.c (1.33 -> 1.34) lib/libalpm/handle.c (1.33 -> 1.34) lib/libalpm/po/de.po (1.10 -> 1.11) lib/libalpm/po/fr.po (1.5 -> 1.6) lib/libalpm/po/hu.po (1.5 -> 1.6) lib/libalpm/po/it.po (1.13 -> 1.14) lib/libalpm/po/libalpm.pot (1.6 -> 1.7) lib/libalpm/po/pt_BR.po (1.4 -> 1.5) src/pacman/po/de.po (1.11 -> 1.12) src/pacman/po/fr.po (1.5 -> 1.6) src/pacman/po/hu.po (1.5 -> 1.6) src/pacman/po/it.po (1.10 -> 1.11) src/pacman/po/pacman.pot (1.7 -> 1.8) src/pacman/po/pt_BR.po (1.6 -> 1.7) src/util/Makefile.am (1.10 -> 1.11) * handle changes: callbacks should check handle first, as there's a few occasions where some alpm stuff could be used without initializing the library (vercmp is one). TODO make these functions (handle accessors) better by returning "library not initialized" instead of failing. * Removed NoUpgrade lines from pacman.conf - we need to test this! * Re-corrected the lib targets for src/util/* * make dist seems to have updated the po files ----------------------------+ etc/pacman.conf.in | 5 lib/libalpm/be_files.c | 2 lib/libalpm/handle.c | 4 lib/libalpm/po/de.po | 124 ++++---- lib/libalpm/po/fr.po | 616 +++++++++++++++++++++++-------------------- lib/libalpm/po/hu.po | 616 +++++++++++++++++++++++-------------------- lib/libalpm/po/it.po | 36 +- lib/libalpm/po/libalpm.pot | 541 ++++++++++++++++++++----------------- lib/libalpm/po/pt_BR.po | 541 ++++++++++++++++++++----------------- src/pacman/po/de.po | 105 ++++--- src/pacman/po/fr.po | 162 +++++------ src/pacman/po/hu.po | 161 +++++------ src/pacman/po/it.po | 151 ++++------ src/pacman/po/pacman.pot | 145 ++++------ src/pacman/po/pt_BR.po | 163 +++++------ src/util/Makefile.am | 4 16 files changed, 1789 insertions(+), 1587 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] Missing ' after '%s
by Giovanni Scafora 04 Mar '07

04 Mar '07

Hi Dan, I guess that you should change the following message: msgid "package '%s not found in sync" to msgid "package '%s' not found in sync" -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 2

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

04 Mar '07

Date: Sunday, March 4, 2007 @ 00:50:58 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/util Modified: Makefile.am (1.9 -> 1.10) * libtool fixes for building against the right libs -------------+ Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/src/util/Makefile.am diff -u pacman-lib/src/util/Makefile.am:1.9 pacman-lib/src/util/Makefile.am:1.10 --- pacman-lib/src/util/Makefile.am:1.9 Wed Feb 21 23:36:03 2007 +++ pacman-lib/src/util/Makefile.am Sun Mar 4 00:50:58 2007 @@ -3,7 +3,7 @@ INCLUDES = -I$(top_srcdir)/lib/libalpm vercmp_SOURCES = vercmp.c -vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so +vercmp_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la testpkg_SOURCES = testpkg.c -testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.so +testpkg_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (remove.c sync.c)
by Dan McGee 04 Mar '07

04 Mar '07

Date: Saturday, March 3, 2007 @ 20:22:57 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: remove.c (1.72 -> 1.73) sync.c (1.107 -> 1.108) * Maybe that call to _alpm_trans_update_depends was necessary. Added it back in but did it right by duplicating the package first. ----------+ remove.c | 10 +++++++++- sync.c | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.72 pacman-lib/lib/libalpm/remove.c:1.73 --- pacman-lib/lib/libalpm/remove.c:1.72 Sat Mar 3 15:22:48 2007 +++ pacman-lib/lib/libalpm/remove.c Sat Mar 3 20:22:57 2007 @@ -264,7 +264,7 @@ int _alpm_remove_commit(pmtrans_t *trans, pmdb_t *db) { - pmpkg_t *info; + pmpkg_t *info, *infodup; alpm_list_t *targ, *lp; ALPM_LOG_FUNC; @@ -330,6 +330,9 @@ } } + /* duplicate the package so we can remove the requiredby fields later */ + infodup = _alpm_pkg_dup(info); + /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, _("updating database")); _alpm_log(PM_LOG_DEBUG, _("removing database entry '%s'"), pkgname); @@ -343,6 +346,11 @@ pkgname); } + /* update dependency packages' REQUIREDBY fields */ + _alpm_trans_update_depends(trans, infodup); + _alpm_pkg_free(infodup); + + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.107 pacman-lib/lib/libalpm/sync.c:1.108 --- pacman-lib/lib/libalpm/sync.c:1.107 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/sync.c Sat Mar 3 20:22:57 2007 @@ -1065,7 +1065,7 @@ } } - _alpm_log(PM_LOG_DEBUG, _("package '%s not found in sync"), pkgname); + _alpm_log(PM_LOG_DEBUG, _("package '%s' not found in sync"), pkgname); return(NULL); /* not found */ }

1 0

[pacman-dev] CVS update of pacman-lib/pactest/tests (remove040.py)
by Aaron Griffin 04 Mar '07

04 Mar '07

Date: Saturday, March 3, 2007 @ 19:14:27 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: remove040.py (1.1) Added a test for checking 'requiredby' removal --------------+ remove040.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) Index: pacman-lib/pactest/tests/remove040.py diff -u /dev/null pacman-lib/pactest/tests/remove040.py:1.1 --- /dev/null Sat Mar 3 19:14:27 2007 +++ pacman-lib/pactest/tests/remove040.py Sat Mar 3 19:14:26 2007 @@ -0,0 +1,18 @@ +self.description = "Remove a package required by another package" + +lp1 = pmpkg("pkg1") +lp1.depends = ["imaginary"] +self.addpkg2db("local", lp1) + +lp2 = pmpkg("pkg2") +lp2.provides = ["imaginary"] +lp2.requiredby = [ "pkg1" ] +self.addpkg2db("local", lp2) + + +self.args = "-R %s" % lp1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("!PKG_REQUIREDBY=pkg2|pkg1")

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (add.c conflict.c remove.c)
by Dan McGee 03 Mar '07

03 Mar '07

Date: Saturday, March 3, 2007 @ 15:22:48 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.122 -> 1.123) conflict.c (1.44 -> 1.45) remove.c (1.71 -> 1.72) * Remove unnecessary call to _alpm_trans_update_depends that was erroring anyway. * Spelling/commenting etc. ------------+ add.c | 2 +- conflict.c | 2 ++ remove.c | 31 ++++++++++++++++++------------- 3 files changed, 21 insertions(+), 14 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.122 pacman-lib/lib/libalpm/add.c:1.123 --- pacman-lib/lib/libalpm/add.c:1.122 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/add.c Sat Mar 3 15:22:48 2007 @@ -402,7 +402,7 @@ alpm_list_t *old_noupgrade = alpm_list_strdup(handle->noupgrade); for(b = alpm_pkg_get_backup(newpkg); b; b = b->next) { const char *backup = b->data; - _alpm_log(PM_LOG_DEBUG, _("adding %s to the NoUpgrade array temporarilly"), backup); + _alpm_log(PM_LOG_DEBUG, _("adding %s to the NoUpgrade array temporarily"), backup); handle->noupgrade = alpm_list_add(handle->noupgrade, strdup(backup)); } Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.44 pacman-lib/lib/libalpm/conflict.c:1.45 --- pacman-lib/lib/libalpm/conflict.c:1.44 Sat Mar 3 04:43:16 2007 +++ pacman-lib/lib/libalpm/conflict.c Sat Mar 3 15:22:48 2007 @@ -244,11 +244,13 @@ continue; } + /* run three different conflict checks on each package */ baddeps = chk_pkg_vs_db(baddeps, pkg, db); baddeps = chk_pkg_vs_targets(baddeps, pkg, db, packages); baddeps = chk_db_vs_targets(baddeps, pkg, db, packages); } + /* debug loop */ for(i = baddeps; i; i = i->next) { pmdepmissing_t *miss = i->data; _alpm_log(PM_LOG_DEBUG, _("\tCONFLICTS:: %s conflicts with %s"), miss->target, miss->depend.name); Index: pacman-lib/lib/libalpm/remove.c diff -u pacman-lib/lib/libalpm/remove.c:1.71 pacman-lib/lib/libalpm/remove.c:1.72 --- pacman-lib/lib/libalpm/remove.c:1.71 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/remove.c Sat Mar 3 15:22:48 2007 @@ -277,22 +277,26 @@ char pm_install[PATH_MAX]; alpm_list_t *files; info = (pmpkg_t*)targ->data; + const char *pkgname = NULL; if(handle->trans->state == STATE_INTERRUPTED) { break; } + /* get the name now so we can use it after package is removed */ + pkgname = alpm_pkg_get_name(info); + if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_START, info, NULL); _alpm_log(PM_LOG_DEBUG, _("removing package %s-%s"), - alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + pkgname, alpm_pkg_get_version(info)); /* run the pre-remove scriptlet if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + pkgname, alpm_pkg_get_version(info)); _alpm_runscriptlet(handle->root, pm_install, "pre_remove", - alpm_pkg_get_version(info), NULL, trans); + alpm_pkg_get_version(info), NULL, trans); } } @@ -302,7 +306,7 @@ for(lp = files; lp; lp = lp->next) { if(!can_remove_file(trans, lp->data)) { _alpm_log(PM_LOG_DEBUG, _("not removing package '%s', can't remove all files"), - alpm_pkg_get_name(info)); + pkgname); RET_ERR(PM_ERR_PKG_CANT_REMOVE, -1); } } @@ -320,7 +324,7 @@ /* run the post-remove script if it exists */ if(alpm_pkg_has_scriptlet(info) && !(trans->flags & PM_TRANS_FLAG_NOSCRIPTLET)) { snprintf(pm_install, PATH_MAX, "%s/%s-%s/install", db->path, - alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + pkgname, alpm_pkg_get_version(info)); _alpm_runscriptlet(handle->root, pm_install, "post_remove", alpm_pkg_get_version(info), NULL, trans); } @@ -328,19 +332,20 @@ /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, _("updating database")); - _alpm_log(PM_LOG_DEBUG, _("removing database entry '%s'"), alpm_pkg_get_name(info)); + _alpm_log(PM_LOG_DEBUG, _("removing database entry '%s'"), pkgname); if(_alpm_db_remove(db, info) == -1) { _alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s"), - alpm_pkg_get_name(info), alpm_pkg_get_version(info)); + pkgname, alpm_pkg_get_version(info)); } + /* remove the package from the cache */ if(_alpm_db_remove_pkgfromcache(db, info) == -1) { - _alpm_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache"), alpm_pkg_get_name(info)); + _alpm_log(PM_LOG_ERROR, _("could not remove entry '%s' from cache"), + pkgname); } - - /* update dependency packages' REQUIREDBY fields */ - _alpm_trans_update_depends(trans, info); - - PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, alpm_pkg_get_name(info), 100, alpm_list_count(trans->packages), (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); + + PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, + alpm_list_count(trans->packages), + (alpm_list_count(trans->packages) - alpm_list_count(targ) +1)); if(trans->type != PM_TRANS_TYPE_UPGRADE) { EVENT(trans, PM_TRANS_EVT_REMOVE_DONE, info, NULL); }

1 0

[pacman-dev] CVS update of pacman-lib (3 files)
by Dan McGee 03 Mar '07

03 Mar '07

Date: Saturday, March 3, 2007 @ 13:45:24 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/de.po (1.9 -> 1.10) lib/libalpm/po/it.po (1.12 -> 1.13) src/pacman/po/de.po (1.10 -> 1.11) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> * Updated German translation Pierre Schmitz <pierre(a)archlinux.de> ----------------------+ lib/libalpm/po/de.po | 598 ++++++++++++++++++++++++++----------------------- lib/libalpm/po/it.po | 548 ++++++++++++++++++++++++-------------------- src/pacman/po/de.po | 156 +++++------- 3 files changed, 674 insertions(+), 628 deletions(-) The diff is longer than the limit of 39KB.

1 0