- Pacman-dev - lists.archlinux.org

[pacman-dev] more efficient use of db_cache needed
by Nagy Gabor 04 Mar '07

04 Mar '07

Hi! It's common practise that you load pkgcache with INFRQ_DEPENDS or similar which is slow, because you must read the whole db directory. Instead it would be more optimal, if you'd load db_cache with INFRQ_NONE almost always (in case of thransactions where only few packages are affected), because that is very fast (name and version are computed from the directory name, so you need to read only the root directory of the repo). And if you find the required package by name, you can read the required info. So first _alpm_db_scan with INFRQ_NONE then _alpm_db_read Bye, Nagy Gabor

3 6

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

04 Mar '07

Date: Sunday, March 4, 2007 @ 12:16:52 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/po/de.po (1.11 -> 1.12) lib/libalpm/po/fr.po (1.6 -> 1.7) lib/libalpm/po/hu.po (1.6 -> 1.7) lib/libalpm/po/it.po (1.14 -> 1.15) lib/libalpm/po/libalpm.pot (1.7 -> 1.8) lib/libalpm/po/pt_BR.po (1.5 -> 1.6) src/pacman/po/de.po (1.12 -> 1.13) src/pacman/po/fr.po (1.6 -> 1.7) src/pacman/po/hu.po (1.6 -> 1.7) src/pacman/po/it.po (1.11 -> 1.12) src/pacman/po/pacman.pot (1.8 -> 1.9) src/pacman/po/pt_BR.po (1.7 -> 1.8) * Hopefully the LAST big update of the language files before release. Translators and developers should count this as the string freeze unless something REALLY essential comes up. Send in patches to these translations when you get a chance (and patches are appreciated, as they are much easier to deal with). ----------------------------+ lib/libalpm/po/de.po | 114 ++++++++++++++++++++++++------------------ lib/libalpm/po/fr.po | 110 ++++++++++++++++++++++++---------------- lib/libalpm/po/hu.po | 110 ++++++++++++++++++++++++---------------- lib/libalpm/po/it.po | 116 +++++++++++++++++++++++++------------------ lib/libalpm/po/libalpm.pot | 108 +++++++++++++++++++++++----------------- lib/libalpm/po/pt_BR.po | 108 +++++++++++++++++++++++----------------- src/pacman/po/de.po | 16 ++--- src/pacman/po/fr.po | 16 ++--- src/pacman/po/hu.po | 16 ++--- src/pacman/po/it.po | 16 ++--- src/pacman/po/pacman.pot | 16 ++--- src/pacman/po/pt_BR.po | 16 ++--- 12 files changed, 441 insertions(+), 321 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib (Makefile.am)
by Dan McGee 04 Mar '07

04 Mar '07

Date: Sunday, March 4, 2007 @ 12:14:37 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: Makefile.am (1.17 -> 1.18) * Update distcheck flags, we no longer need to pass --disable-fakeroot. All tests are passing except 1 known to fail (upgrade051). -------------+ Makefile.am | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) Index: pacman-lib/Makefile.am diff -u pacman-lib/Makefile.am:1.17 pacman-lib/Makefile.am:1.18 --- pacman-lib/Makefile.am:1.17 Thu Feb 22 23:54:49 2007 +++ pacman-lib/Makefile.am Sun Mar 4 12:14:37 2007 @@ -1,14 +1,12 @@ SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc pactest contrib -DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot +#DISTCHECK_CONFIGURE_FLAGS = --disable-fakeroot # Some files automatically included, so they aren't specified below: # AUTHORS, COPYING, NEWS, README EXTRA_DIST = HACKING -# TODO : figure out a way to get 'make distcheck' to build with -# --disable-fakeroot so it actually passes tests check-local: src/pacman - python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman --debug=1 + python $(top_srcdir)/pactest/pactest.py --test $(top_srcdir)/pactest/tests/*.py -p $(top_builddir)/src/pacman/pacman rm -rf $(top_builddir)/root

1 0

[pacman-dev] 20070304 Italian libalpm patch
by Giovanni Scafora 04 Mar '07

04 Mar '07

Hi guys, there is a new patch with new messages. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

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

04 Mar '07

Date: Sunday, March 4, 2007 @ 05:27:49 Author: aaron Path: /home/cvs-pacman/pacman-lib/pactest/tests Added: upgrade023.py (1.1) * By Roman's request - proactive backup=() entry test case ---------------+ upgrade023.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) Index: pacman-lib/pactest/tests/upgrade023.py diff -u /dev/null pacman-lib/pactest/tests/upgrade023.py:1.1 --- /dev/null Sun Mar 4 05:27:49 2007 +++ pacman-lib/pactest/tests/upgrade023.py Sun Mar 4 05:27:49 2007 @@ -0,0 +1,17 @@ +self.description = "Upgrade a package, with a backup file in the NEW package only" + +lp = pmpkg("dummy") +lp.files = ["etc/dummy.conf*"] +self.addpkg2db("local", lp) + +p = pmpkg("dummy", "1.1-1") +p.files = ["etc/dummy.conf"] +p.backup = ["etc/dummy.conf"] +self.addpkg(p) + +self.args = "-U %s" % p.filename() + +self.addrule("PKG_VERSION=dummy|1.1-1") +self.addrule("!FILE_MODIFIED=etc/dummy.conf") +# Do we want this pacnew or not? +self.addrule("FILE_PACNEW=etc/dummy.conf")

1 0

[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

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Dan McGee 03 Mar '07

03 Mar '07

Date: Saturday, March 3, 2007 @ 13:38:57 Author: dan Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.55 -> 1.56) * file utility was updated to version 4.20, removing code that was there to catch a bug in 4.19. ---------+ makepkg | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.55 pacman-lib/scripts/makepkg:1.56 --- pacman-lib/scripts/makepkg:1.55 Wed Feb 28 00:08:25 2007 +++ pacman-lib/scripts/makepkg Sat Mar 3 13:38:57 2007 @@ -769,23 +769,17 @@ file_type=$(file -biz "$file") unset cmd case "$file_type" in - # START REMOVE - # TODO remove this with release of file v4.20, temp bugfix - *application/empty*) - cmd="tar -xf $file" - warning "file had trouble detecting type, assuming tar" ;; - # END REMOVE *application/x-tar*) - cmd="tar -xf $file" ;; + cmd="tar -xf $file" ;; *application/x-zip*) - unziphack=1 - cmd="unzip -qqo $file" ;; + unziphack=1 + cmd="unzip -qqo $file" ;; *application/x-cpio*) - cmd="bsdtar -x -f $file" ;; + cmd="bsdtar -x -f $file" ;; *application/x-gzip*) - cmd="gunzip -f $file" ;; + cmd="gunzip -f $file" ;; *application/x-bzip*) - cmd="bunzip2 -f $file" ;; + cmd="bunzip2 -f $file" ;; esac if [ "$cmd" != "" ]; then msg2 "$cmd"

1 0

[pacman-dev] 20070303 Italian translation
by Giovanni Scafora 03 Mar '07

03 Mar '07

Hi guys, there is a new patch for libalpm italian translation with new messages, some fuzzy messages corrected and some improvements to the translation. Thanks. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

1 0

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

03 Mar '07

Date: Saturday, March 3, 2007 @ 05:49:42 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: TODO.aaron (1.19 -> 1.20) Minor changes ------------+ TODO.aaron | 7 ------- 1 file changed, 7 deletions(-) Index: pacman-lib/TODO.aaron diff -u pacman-lib/TODO.aaron:1.19 pacman-lib/TODO.aaron:1.20 --- pacman-lib/TODO.aaron:1.19 Thu Feb 22 21:15:00 2007 +++ pacman-lib/TODO.aaron Sat Mar 3 05:49:42 2007 @@ -1,18 +1,11 @@ == This is my custom TODO file == -* 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

1 0

[pacman-dev] Updated German translation
by Pierre Schmitz 03 Mar '07

03 Mar '07

Hi, I synchronized the German translation to current pacman-cvs: http://svn.laber-land.de/pacman-de/trunk/lib/libalpm/po/de.po http://svn.laber-land.de/pacman-de/trunk/src/pacman/po/de.po BTW: I think for pacman 3.1 it would be nice to include alle user visible into one po-file and get rid of an libalpm po-file. We should left all debugging messages untranslated. This would make it a lot easier to write bug-reports. -- http://www.archlinux.de

3 3

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

03 Mar '07

Date: Saturday, March 3, 2007 @ 04:43:17 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/conflict.c (1.43 -> 1.44) lib/libalpm/deps.c (1.74 -> 1.75) lib/libalpm/deps.h (1.18 -> 1.19) lib/libalpm/package.c (1.82 -> 1.83) lib/libalpm/trans.c (1.40 -> 1.41) src/pacman/trans.c (1.40 -> 1.41) * A little more hacking with wchar_t output, but nothing really changed in it. Eventually we'll make progress. * Rewrote the _alpm_splitdep function to behave more like all our other function calls. Use heap instead of stack allocation for the depend struct, so now it needs to be freed by the caller. ------------------------+ lib/libalpm/conflict.c | 4 - lib/libalpm/deps.c | 132 +++++++++++++++++++++++++---------------------- lib/libalpm/deps.h | 2 lib/libalpm/package.c | 14 ++-- lib/libalpm/trans.c | 15 ++--- src/pacman/trans.c | 24 ++++++-- 6 files changed, 108 insertions(+), 83 deletions(-) Index: pacman-lib/lib/libalpm/conflict.c diff -u pacman-lib/lib/libalpm/conflict.c:1.43 pacman-lib/lib/libalpm/conflict.c:1.44 --- pacman-lib/lib/libalpm/conflict.c:1.43 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/conflict.c Sat Mar 3 04:43:16 2007 @@ -47,14 +47,14 @@ #include "conflict.h" -/** See if potential conflict 'name' matches package 'pkg' +/** See if potential conflict 'name' matches package 'pkg'. * @param target the name of the parent package we're checking * @param depname the name of the dependency we're checking * @param pkg the package to check * @param conflict the name of the possible conflict * @return A depmissing struct indicating the conflict * @note The first two paramters are here to simplify the addition - * of new 'depmiss' objects + * of new 'depmiss' objects. * * TODO WTF is a 'depmissing' doing indicating a conflict?? */ Index: pacman-lib/lib/libalpm/deps.c diff -u pacman-lib/lib/libalpm/deps.c:1.74 pacman-lib/lib/libalpm/deps.c:1.75 --- pacman-lib/lib/libalpm/deps.c:1.74 Sat Mar 3 03:13:59 2007 +++ pacman-lib/lib/libalpm/deps.c Sat Mar 3 04:43:16 2007 @@ -139,18 +139,18 @@ pmpkg_t *p = i->data; _alpm_log(PM_LOG_DEBUG, " sorting %s", alpm_pkg_get_name(p)); for(j = alpm_pkg_get_depends(p); j; j = j->next) { - pmdepend_t dep; + pmdepend_t *depend = _alpm_splitdep(j->data); pmpkg_t *q = NULL; - if(_alpm_splitdep(j->data, &dep)) { + if(depend == NULL) { continue; } - /* look for dep.name -- if it's farther down in the list, then + /* look for depend->name -- if it's farther down in the list, then * move it up above p */ for(k = i->next; k; k = k->next) { q = k->data; const char *qname = alpm_pkg_get_name(q); - if(!strcmp(dep.name, qname)) { + if(!strcmp(depend->name, qname)) { if(!_alpm_pkg_find(qname, tmptargs)) { change = 1; tmptargs = alpm_list_add(tmptargs, q); @@ -159,7 +159,7 @@ } for(l = alpm_pkg_get_provides(q); l; l = l->next) { const char *provname = l->data; - if(!strcmp(dep.name, provname)) { + if(!strcmp(depend->name, provname)) { if(!_alpm_pkg_find(provname, tmptargs)) { change = 1; tmptargs = alpm_list_add(tmptargs, q); @@ -168,6 +168,7 @@ } } } + free(depend); } if(!_alpm_pkg_find(alpm_pkg_get_name(p), tmptargs)) { tmptargs = alpm_list_add(tmptargs, p); @@ -199,7 +200,6 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op, alpm_list_t *packages) { - pmdepend_t depend; alpm_list_t *i, *j, *k, *l; int found = 0; alpm_list_t *baddeps = NULL; @@ -241,19 +241,22 @@ } for(k = alpm_pkg_get_depends(p); k; k = k->next) { /* don't break any existing dependencies (possible provides) */ - _alpm_splitdep(k->data, &depend); + pmdepend_t *depend = _alpm_splitdep(k->data); + if(depend == NULL) { + continue; + } /* if oldpkg satisfied this dep, and newpkg doesn't */ - if(_alpm_depcmp(oldpkg, &depend) && !_alpm_depcmp(newpkg, &depend)) { + if(_alpm_depcmp(oldpkg, depend) && !_alpm_depcmp(newpkg, depend)) { /* we've found a dep that was removed... see if any other package * still contains/provides the dep */ int satisfied = 0; for(l = packages; l; l = l->next) { pmpkg_t *pkg = l->data; - if(_alpm_depcmp(pkg, &depend)) { + if(_alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' has moved from '%s' to '%s'"), - depend.name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); + depend->name, alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -270,9 +273,9 @@ continue; } - if(_alpm_depcmp(pkg, &depend)) { + if(_alpm_depcmp(pkg, depend)) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: dependency '%s' satisfied by installed package '%s'"), - depend.name, alpm_pkg_get_name(pkg)); + depend->name, alpm_pkg_get_name(pkg)); satisfied = 1; break; } @@ -282,8 +285,8 @@ if(!satisfied) { _alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"), alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p)); - miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend.mod, - depend.name, depend.version); + miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend->mod, + depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { @@ -291,6 +294,7 @@ } } } + free(depend); } } } @@ -306,17 +310,21 @@ for(j = alpm_pkg_get_depends(tp); j; j = j->next) { /* split into name/version pairs */ - _alpm_splitdep((char *)j->data, &depend); + pmdepend_t *depend = _alpm_splitdep((char*)j->data); + if(depend == NULL) { + continue; + } + found = 0; /* check database for literal packages */ for(k = _alpm_db_get_pkgcache(db); k && !found; k = k->next) { pmpkg_t *p = (pmpkg_t *)k->data; - found = _alpm_depcmp(p, &depend); + found = _alpm_depcmp(p, depend); } /* check database for provides matches */ if(!found) { alpm_list_t *m; - for(m = _alpm_db_whatprovides(db, depend.name); m && !found; m = m->next) { + for(m = _alpm_db_whatprovides(db, depend->name); m && !found; m = m->next) { /* look for a match that isn't one of the packages we're trying * to install. this way, if we match against a to-be-installed * package, we'll defer to the NEW one, not the one already @@ -334,27 +342,28 @@ continue; } - found = _alpm_depcmp(p, &depend); + found = _alpm_depcmp(p, depend); } FREELISTPTR(k); } /* check other targets */ for(k = packages; k && !found; k = k->next) { pmpkg_t *p = k->data; - found = _alpm_depcmp(p, &depend); + found = _alpm_depcmp(p, depend); } /* else if still not found... */ if(!found) { _alpm_log(PM_LOG_DEBUG, _("missing dependency '%s' for package '%s'"), - depend.name, alpm_pkg_get_name(tp)); - miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend.mod, - depend.name, depend.version); + depend->name, alpm_pkg_get_name(tp)); + miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND, depend->mod, + depend->name, depend->version); if(!_alpm_depmiss_isin(miss, baddeps)) { baddeps = alpm_list_add(baddeps, miss); } else { FREE(miss); } } + free(depend); } } } else if(op == PM_TRANS_TYPE_REMOVE) { @@ -412,47 +421,49 @@ return(baddeps); } -int _alpm_splitdep(char *depstr, pmdepend_t *depend) +pmdepend_t *_alpm_splitdep(const char *depstring) { - char *str = NULL, *ptr = NULL; + pmdepend_t *depend; + char *ptr = NULL; - if(depstr == NULL || depend == NULL) { - return(-1); + if(depstring == NULL) { + return(NULL); + } + + depend = (pmdepend_t *)malloc(sizeof(pmdepend_t)); + if(depend == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes"), sizeof(pmdepend_t)); + return(NULL); } - depend->mod = 0; - depend->name[0] = 0; - depend->version[0] = 0; - - str = strdup(depstr); - - if((ptr = strstr(str, ">="))) { + /* Find a version comparator if one exists. If it does, set the type and + * increment the ptr accordingly so we can copy the right strings. */ + if((ptr = strstr(depstring, ">="))) { depend->mod = PM_DEP_MOD_GE; - } else if((ptr = strstr(str, "<="))) { + *ptr = '\0'; + ptr += 2; + } else if((ptr = strstr(depstring, "<="))) { depend->mod = PM_DEP_MOD_LE; - } else if((ptr = strstr(str, "="))) { + *ptr = '\0'; + ptr += 2; + } else if((ptr = strstr(depstring, "="))) { depend->mod = PM_DEP_MOD_EQ; + *ptr = '\0'; + ptr += 1; } else { - /* no version specified - accept any */ + /* no version specified - copy in the name and return it */ depend->mod = PM_DEP_MOD_ANY; - STRNCPY(depend->name, str, PKG_NAME_LEN); + strncpy(depend->name, depstring, PKG_NAME_LEN); + depend->version[0] = '\0'; + return(depend); } - if(ptr == NULL) { - FREE(str); - return(0); - } - *ptr = '\0'; - STRNCPY(depend->name, str, PKG_NAME_LEN); - ptr++; - if(depend->mod != PM_DEP_MOD_EQ) { - ptr++; - } - - STRNCPY(depend->version, ptr, PKG_VERSION_LEN); - FREE(str); + /* if we get here, we have a version comparator, copy the right parts + * to the right places */ + strncpy(depend->name, depstring, PKG_NAME_LEN); + strncpy(depend->version, ptr, PKG_VERSION_LEN); - return(0); + return(depend); } /* These parameters are messy. We check if this package, given a list of @@ -503,19 +514,19 @@ for(i = targs; i; i = i->next) { pmpkg_t *pkg = i->data; for(j = alpm_pkg_get_depends(pkg); j; j = j->next) { - pmdepend_t depend; - pmpkg_t *dep; - if(_alpm_splitdep(j->data, &depend)) { + pmdepend_t *depend = _alpm_splitdep(j->data); + pmpkg_t *deppkg; + if(depend == NULL) { continue; } - dep = _alpm_db_get_pkgfromcache(db, depend.name); - if(dep == NULL) { + deppkg = _alpm_db_get_pkgfromcache(db, depend->name); + if(deppkg == NULL) { /* package not found... look for a provision instead */ - alpm_list_t *provides = _alpm_db_whatprovides(db, depend.name); + alpm_list_t *provides = _alpm_db_whatprovides(db, depend->name); if(!provides) { /* Not found, that's fine, carry on */ - _alpm_log(PM_LOG_DEBUG, _("cannot find package \"%s\" or anything that provides it!"), depend.name); + _alpm_log(PM_LOG_DEBUG, _("cannot find package \"%s\" or anything that provides it!"), depend->name); continue; } for(k = provides; k; k = k->next) { @@ -531,8 +542,8 @@ } } FREELISTPTR(provides); - } else if(can_remove_package(db, dep, newtargs)) { - pmpkg_t *pkg = _alpm_pkg_new(dep->name, dep->version); + } else if(can_remove_package(db, deppkg, newtargs)) { + pmpkg_t *pkg = _alpm_pkg_new(deppkg->name, deppkg->version); _alpm_log(PM_LOG_DEBUG, _("adding '%s' to the targets"), alpm_pkg_get_name(pkg)); @@ -540,6 +551,7 @@ newtargs = alpm_list_add(newtargs, pkg); newtargs = _alpm_removedeps(db, newtargs); } + free(depend); } } Index: pacman-lib/lib/libalpm/deps.h diff -u pacman-lib/lib/libalpm/deps.h:1.18 pacman-lib/lib/libalpm/deps.h:1.19 --- pacman-lib/lib/libalpm/deps.h:1.18 Wed Jan 31 03:10:03 2007 +++ pacman-lib/lib/libalpm/deps.h Sat Mar 3 04:43:16 2007 @@ -49,7 +49,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op, alpm_list_t *packages); -int _alpm_splitdep(char *depstr, pmdepend_t *depend); +pmdepend_t *_alpm_splitdep(const char *depstring); alpm_list_t *_alpm_removedeps(pmdb_t *db, alpm_list_t *targs); int _alpm_resolvedeps(pmdb_t *local, alpm_list_t *dbs_sync, pmpkg_t *syncpkg, alpm_list_t *list, alpm_list_t *trail, pmtrans_t *trans, Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.82 pacman-lib/lib/libalpm/package.c:1.83 --- pacman-lib/lib/libalpm/package.c:1.82 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/package.c Sat Mar 3 04:43:16 2007 @@ -546,16 +546,17 @@ } pmpkg_t *cachepkg = i->data; for(j = alpm_pkg_get_depends(cachepkg); j; j = j->next) { - pmdepend_t dep; + pmdepend_t *dep; if(!j->data) { continue; } - if(_alpm_splitdep(j->data, &dep) != 0) { - continue; + dep = _alpm_splitdep(j->data); + if(dep == NULL) { + continue; } - + /* check the actual package itself */ - if(strcmp(dep.name, alpm_pkg_get_name(pkg)) == 0) { + if(strcmp(dep->name, alpm_pkg_get_name(pkg)) == 0) { _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s'"), cachepkg->name, pkg->name); alpm_list_t *reqs = alpm_pkg_get_requiredby(pkg); @@ -566,7 +567,7 @@ /* check for provisions as well */ for(k = alpm_pkg_get_provides(pkg); k; k = k->next) { const char *provname = k->data; - if(strcmp(dep.name, provname) == 0) { + if(strcmp(dep->name, provname) == 0) { _alpm_log(PM_LOG_DEBUG, _("adding '%s' in requiredby field for '%s' (provides: %s)"), alpm_pkg_get_name(cachepkg), alpm_pkg_get_name(pkg), provname); alpm_list_t *reqs = alpm_pkg_get_requiredby(pkg); @@ -574,6 +575,7 @@ pkg->requiredby = reqs; } } + free(dep); } } } Index: pacman-lib/lib/libalpm/trans.c diff -u pacman-lib/lib/libalpm/trans.c:1.40 pacman-lib/lib/libalpm/trans.c:1.41 --- pacman-lib/lib/libalpm/trans.c:1.40 Sat Mar 3 03:14:00 2007 +++ pacman-lib/lib/libalpm/trans.c Sat Mar 3 04:43:16 2007 @@ -269,22 +269,22 @@ localdb = alpm_option_get_localdb(); for(i = depends; i; i = i->next) { - pmdepend_t dep; - if(_alpm_splitdep(i->data, &dep) != 0) { + pmdepend_t* dep = _alpm_splitdep(i->data); + if(dep == NULL) { continue; } - + if(trans->packages && trans->type == PM_TRANS_TYPE_REMOVE) { - if(_alpm_pkg_find(dep.name, handle->trans->packages)) { + if(_alpm_pkg_find(dep->name, handle->trans->packages)) { continue; } } - pmpkg_t *deppkg = _alpm_db_get_pkgfromcache(localdb, dep.name); + pmpkg_t *deppkg = _alpm_db_get_pkgfromcache(localdb, dep->name); if(!deppkg) { int found_provides = 0; /* look for a provides package */ - alpm_list_t *provides = _alpm_db_whatprovides(localdb, dep.name); + alpm_list_t *provides = _alpm_db_whatprovides(localdb, dep->name); for(j = provides; j; j = j->next) { if(!j->data) { continue; @@ -319,7 +319,7 @@ FREELISTPTR(provides); if(!found_provides) { - _alpm_log(PM_LOG_DEBUG, _("could not find dependency '%s'"), dep.name); + _alpm_log(PM_LOG_DEBUG, _("could not find dependency '%s'"), dep->name); continue; } } @@ -341,6 +341,7 @@ _alpm_log(PM_LOG_ERROR, _("could not update 'requiredby' database entry %s-%s"), alpm_pkg_get_name(deppkg), alpm_pkg_get_version(deppkg)); } + free(dep); } return(0); } Index: pacman-lib/src/pacman/trans.c diff -u pacman-lib/src/pacman/trans.c:1.40 pacman-lib/src/pacman/trans.c:1.41 --- pacman-lib/src/pacman/trans.c:1.40 Sat Mar 3 03:14:00 2007 +++ pacman-lib/src/pacman/trans.c Sat Mar 3 04:43:16 2007 @@ -27,6 +27,7 @@ #include <unistd.h> #include <dirent.h> #include <libintl.h> +#include <wchar.h> #include <alpm.h> /* pacman */ @@ -284,8 +285,9 @@ /* size of line to allocate for text printing (e.g. not progressbar) */ const int infolen = 50; - int i, digits, textlen, pkglen; + int tmp, digits, oprlen, textlen, pkglen; char *opr = NULL; + wchar_t *wcopr = NULL; if(config->noprogressbar) { return; @@ -318,6 +320,7 @@ } prevpercent=percent; + /* set text of message to display */ switch (event) { case PM_TRANS_PROGRESS_ADD_START: opr = _("installing"); @@ -332,26 +335,31 @@ opr = _("checking for file conflicts"); break; } + /* convert above strings to wide chars */ + oprlen = strlen(opr); + wcopr = (wchar_t*)calloc(oprlen, sizeof(wchar_t)); + if(!wcopr) { + fprintf(stderr, "malloc failure: could not allocate %d bytes\n", + strlen(opr) * sizeof(wchar_t)); + } + oprlen = mbstowcs(wcopr, opr, oprlen); /* find # of digits in package counts to scale output */ digits = 1; - i = howmany; - while((i /= 10)) { + tmp = howmany; + while((tmp /= 10)) { ++digits; } /* determine room left for non-digits text [not ( 1/12) part] */ textlen = infolen - 3 - (2 * digits); /* room left for package name */ - pkglen = textlen - mbstowcs(NULL, opr, 0) - 1; + pkglen = textlen - oprlen - 1; switch (event) { case PM_TRANS_PROGRESS_ADD_START: case PM_TRANS_PROGRESS_UPGRADE_START: case PM_TRANS_PROGRESS_REMOVE_START: - /* TODO clean up so digits and pkglen aren't passed twice */ - /* TODO we may need some sort of wchar_t wprintf output here in order - * to get the lengths right, prinf works on bytes and not chars */ printf("(%2$*1$d/%3$*1$d) %4$s %6$-*5$.*5$s", digits, remain, howmany, opr, pkglen, pkgname); break; @@ -361,6 +369,8 @@ break; } + free(wcopr); + /* call refactored fill progress function */ fill_progress(percent, getcols() - infolen);

1 0

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

03 Mar '07

Date: Saturday, March 3, 2007 @ 03:14:00 Author: aaron Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/add.c (1.121 -> 1.122) lib/libalpm/alpm.c (1.121 -> 1.122) lib/libalpm/alpm.h (1.78 -> 1.79) lib/libalpm/alpm_list.c (1.8 -> 1.9) lib/libalpm/alpm_list.h (1.6 -> 1.7) lib/libalpm/be_files.c (1.32 -> 1.33) lib/libalpm/cache.c (1.36 -> 1.37) lib/libalpm/cache.h (1.11 -> 1.12) lib/libalpm/conflict.c (1.42 -> 1.43) lib/libalpm/db.c (1.63 -> 1.64) lib/libalpm/db.h (1.29 -> 1.30) lib/libalpm/deps.c (1.73 -> 1.74) lib/libalpm/package.c (1.81 -> 1.82) lib/libalpm/package.h (1.33 -> 1.34) lib/libalpm/provide.c (1.12 -> 1.13) lib/libalpm/remove.c (1.70 -> 1.71) lib/libalpm/sync.c (1.106 -> 1.107) lib/libalpm/sync.h (1.17 -> 1.18) lib/libalpm/trans.c (1.39 -> 1.40) lib/libalpm/util.c (1.46 -> 1.47) lib/libalpm/util.h (1.22 -> 1.23) lib/libalpm/versioncmp.c (1.15 -> 1.16) src/pacman/trans.c (1.39 -> 1.40) src/pacman/trans.h (1.8 -> 1.9) Big commit this time: * Moved entirely to alpm_pkg_get_* accessors, to read data on demand * Mostly removed the INFRQ_ parameters from outside the be_files backend (making the backend more extensible in the long run) * packages created from _alpm_db_scan now have the db and origin set (making accessors actually work for these packages) * removed _alpm_db_ensure_pkgcache * totally revamped the _alpm_checkconflicts function, making it cleaner and easier to read (and thus fix in the long run) - maintainable code ftw NOTE: feel free to rename the functions... I couldn't think of anything better * removed an extra loop in sync.c:find_replacements - no sense in looping over an entire DB while strcmp'ing the name, when we have get_pkgfromcache Other: * package struct "license" -> "licenses" * Created _alpm_sync_find (duplicate code in some places, find_pkginsync * Minor const correctness changes along the way * fixed a couple extra '/' pathing issues (non-issues really) * removed a duplicate pkg_cmp function --------------------------+ lib/libalpm/add.c | 60 ++++--- lib/libalpm/alpm.c | 108 ++++++-------- lib/libalpm/alpm.h | 2 lib/libalpm/alpm_list.c | 2 lib/libalpm/alpm_list.h | 2 lib/libalpm/be_files.c | 17 +- lib/libalpm/cache.c | 82 ++++------ lib/libalpm/cache.h | 4 lib/libalpm/conflict.c | 343 +++++++++++++++++++++++++-------------------- lib/libalpm/db.c | 16 +- lib/libalpm/db.h | 2 lib/libalpm/deps.c | 124 +++++++--------- lib/libalpm/package.c | 67 +++++--- lib/libalpm/package.h | 2 lib/libalpm/provide.c | 2 lib/libalpm/remove.c | 50 +++--- lib/libalpm/sync.c | 255 +++++++++++++++++---------------- lib/libalpm/sync.h | 3 lib/libalpm/trans.c | 34 ++-- lib/libalpm/util.c | 28 +-- lib/libalpm/util.h | 16 +- lib/libalpm/versioncmp.c | 8 - src/pacman/trans.c | 4 src/pacman/trans.h | 4 24 files changed, 657 insertions(+), 578 deletions(-) The diff is longer than the limit of 39KB.

1 0

[pacman-dev] CVS update of pacman-lib/lib/libalpm (db.h)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Thursday, March 1, 2007 @ 17:11:02 Author: dan Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: db.h (1.28 -> 1.29) * Oops- I need to learn to count in hex. ------+ db.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.28 pacman-lib/lib/libalpm/db.h:1.29 --- pacman-lib/lib/libalpm/db.h:1.28 Thu Mar 1 14:07:39 2007 +++ pacman-lib/lib/libalpm/db.h Thu Mar 1 17:11:02 2007 @@ -32,7 +32,7 @@ INFRQ_DESC = 0x02, INFRQ_DEPENDS = 0x04, INFRQ_FILES = 0x08, - INFRQ_SCRIPTLET = 0x16, + INFRQ_SCRIPTLET = 0x10, INFRQ_ALL = 0xFF } pmdbinfrq_t;

1 0

[pacman-dev] CVS update of pacman-lib/doc (makepkg.8)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Thursday, March 1, 2007 @ 15:16:15 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: makepkg.8 (1.8 -> 1.9) * Slight documentation update. -----------+ makepkg.8 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) Index: pacman-lib/doc/makepkg.8 diff -u pacman-lib/doc/makepkg.8:1.8 pacman-lib/doc/makepkg.8:1.9 --- pacman-lib/doc/makepkg.8:1.8 Fri Feb 23 14:51:24 2007 +++ pacman-lib/doc/makepkg.8 Thu Mar 1 15:16:15 2007 @@ -13,12 +13,16 @@ .SH DESCRIPTION \fBmakepkg\fP is a script to automate the building of packages. All it needs is a build-capable Linux platform and a custom build script for each package you -wish to build (known as a \fB\*(PB\fP). The advantage to a script-based build -is that the work is only done once. Once you have the build script for a -package, makepkg will do the rest: download and validate source files, check -dependencies, configure the build-time settings, build the package, install the -package into a temporary root, make customizations, generate meta-info, and -package the whole thing up for \fBpacman\fP to use. +wish to build (known as a \fB\*(PB\fP). See +.BR \*(PB (5) +for details on creating your own build scripts. + +The advantage to a script-based build is that the work is only done once. Once +you have the build script for a package, makepkg will do the rest: download and +validate source files, check dependencies, configure the build-time settings, +build the package, install the package into a temporary root, make +customizations, generate meta-info, and package the whole thing up for +\fBpacman\fP to use. \fBmakeworld\fP can be used to rebuild an entire package group or the entire build tree. See \fBmakeworld --help\fP for syntax.

1 0

[pacman-dev] CVS update of pacman-lib (.cvsignore lib/libalpm/po/it.po)
by Dan McGee 01 Mar '07

01 Mar '07

Date: Thursday, March 1, 2007 @ 14:36:26 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.6 -> 1.7) lib/libalpm/po/it.po (1.11 -> 1.12) * Updated Italian translation Giovanni Scafora <linuxmania(a)gmail.com> ----------------------+ .cvsignore | 1 lib/libalpm/po/it.po | 215 ++++++++++++++++++++++++++++--------------------- 2 files changed, 127 insertions(+), 89 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.6 pacman-lib/.cvsignore:1.7 --- pacman-lib/.cvsignore:1.6 Thu Feb 22 21:00:30 2007 +++ pacman-lib/.cvsignore Thu Mar 1 14:36:26 2007 @@ -18,6 +18,7 @@ missing stamp-h1 +root tags cscope.out pacman-*.tar.gz Index: pacman-lib/lib/libalpm/po/it.po diff -u pacman-lib/lib/libalpm/po/it.po:1.11 pacman-lib/lib/libalpm/po/it.po:1.12 --- pacman-lib/lib/libalpm/po/it.po:1.11 Wed Feb 28 23:51:24 2007 +++ pacman-lib/lib/libalpm/po/it.po Thu Mar 1 14:36:26 2007 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: libalpm VERSION\n" "Report-Msgid-Bugs-To: pacman-dev(a)archlinux.org\n" -"POT-Creation-Date: 2007-02-28 17:26+0100\n" -"PO-Revision-Date: 2007-02-24 12:00+0100\n" +"POT-Creation-Date: 2007-03-01 11:44+0100\n" +"PO-Revision-Date: 2007-03-01 12:30+0100\n" "Last-Translator: Giovanni Scafora <linuxmania(a)gmail.com>\n" "Language-Team: Arch Linux Italian Team <linuxmania(a)gmail.com>\n" "MIME-Version: 1.0\n" @@ -71,202 +71,217 @@ msgid "upgrading package %s-%s" msgstr "aggiornamento del pacchetto %s-%s in corso" -#: lib/libalpm/add.c:363 +#: lib/libalpm/add.c:364 #, c-format msgid "adding package %s-%s" msgstr "inclusione del pacchetto %s-%s in corso" -#: lib/libalpm/add.c:376 +#: lib/libalpm/add.c:377 #, c-format msgid "removing old package first (%s-%s)" msgstr "rimozione del vecchio pacchetto (%s-%s) in corso" -#: lib/libalpm/add.c:403 +#: lib/libalpm/add.c:404 #, c-format msgid "adding %s to the NoUpgrade array temporarilly" msgstr "aggiunta in corso di %s nell'array temporaneo NoUpgrade" -#: lib/libalpm/add.c:421 +#: lib/libalpm/add.c:422 msgid "extracting files" msgstr "estrazione dei file in corso" -#: lib/libalpm/add.c:436 lib/libalpm/util.c:461 +#: lib/libalpm/add.c:437 lib/libalpm/util.c:461 msgid "could not get current working directory" msgstr "impossibile utilizzare la directory corrente" -#: lib/libalpm/add.c:492 +#: lib/libalpm/add.c:493 #, c-format msgid "%s is in NoExtract, skipping extraction" msgstr "%s è in NoExtract, estrazione ignorata" -#: lib/libalpm/add.c:493 +#: lib/libalpm/add.c:494 #, c-format msgid "notice: %s is in NoExtract -- skipping extraction" msgstr "avviso: %s è in NoExtract -- estrazione ignorata" -#: lib/libalpm/add.c:500 +#: lib/libalpm/add.c:501 #, c-format msgid "%s is in trans->skip_add, skipping extraction" msgstr "%s è in trans->skip_add, estrazione ignorata" -#: lib/libalpm/add.c:546 lib/libalpm/add.c:547 lib/libalpm/add.c:696 +#: lib/libalpm/add.c:547 lib/libalpm/add.c:548 lib/libalpm/add.c:697 #, c-format msgid "could not extract %s (%s)" msgstr "impossibile estrarre %s (%s)" -#: lib/libalpm/add.c:590 +#: lib/libalpm/add.c:591 #, c-format msgid "checking md5 hashes for %s" msgstr "controllo dell'hash md5 di %s" -#: lib/libalpm/add.c:592 +#: lib/libalpm/add.c:593 #, c-format msgid "checking sha1 hashes for %s" msgstr "controllo dell'hash sha1 di %s" -#: lib/libalpm/add.c:594 +#: lib/libalpm/add.c:595 #, c-format msgid "current: %s" msgstr "attuale: %s" -#: lib/libalpm/add.c:595 +#: lib/libalpm/add.c:596 #, c-format msgid "new: %s" msgstr "nuovo: %s" -#: lib/libalpm/add.c:596 +#: lib/libalpm/add.c:597 #, c-format msgid "original: %s" msgstr "originale: %s" -#: lib/libalpm/add.c:608 +#: lib/libalpm/add.c:609 #, c-format msgid "could not rename %s (%s)" msgstr "impossibile rinominare %s (%s)" -#: lib/libalpm/add.c:609 +#: lib/libalpm/add.c:610 #, c-format msgid "error: could not rename %s (%s)" msgstr "errore: impossibile rinominare %s (%s)" -#: lib/libalpm/add.c:615 lib/libalpm/add.c:634 +#: lib/libalpm/add.c:616 lib/libalpm/add.c:635 #, c-format msgid "could not copy tempfile to %s (%s)" msgstr "impossibile copiare il file temporaneo in %s (%s)" -#: lib/libalpm/add.c:616 +#: lib/libalpm/add.c:617 #, c-format msgid "error: could not copy tempfile to %s (%s)" msgstr "errore: impossibile copiare il file temporaneo in %s (%s)" -#: lib/libalpm/add.c:620 +#: lib/libalpm/add.c:621 #, c-format msgid "%s saved as %s.pacorig" msgstr "%s salvato come %s.pacorig" -#: lib/libalpm/add.c:621 +#: lib/libalpm/add.c:622 #, c-format msgid "warning: %s saved as %s" msgstr "attenzione: %s salvato come %s" -#: lib/libalpm/add.c:631 +#: lib/libalpm/add.c:632 #, c-format msgid "action: installing new file: %s" msgstr "azione: installazione del nuovo file %s in corso" -#: lib/libalpm/add.c:641 lib/libalpm/add.c:647 lib/libalpm/add.c:652 +#: lib/libalpm/add.c:642 lib/libalpm/add.c:648 lib/libalpm/add.c:653 msgid "action: leaving existing file in place" msgstr "azione: il file non è stato spostato" -#: lib/libalpm/add.c:655 +#: lib/libalpm/add.c:656 msgid "action: keeping current file and installing new one with .pacnew ending" msgstr "" "azione: il file attuale non è stato spostato e sarà installato un nuovo file " "con il suffisso .pacnew" -#: lib/libalpm/add.c:658 +#: lib/libalpm/add.c:659 #, c-format msgid "could not install %s as %s: %s" msgstr "impossibile installare %s come %s: %s" -#: lib/libalpm/add.c:659 +#: lib/libalpm/add.c:660 #, c-format msgid "error: could not install %s as %s: %s" msgstr "errore: impossibile installare %s come %s: %s" -#: lib/libalpm/add.c:661 +#: lib/libalpm/add.c:662 #, c-format msgid "%s installed as %s" msgstr "%s installato come %s" -#: lib/libalpm/add.c:662 +#: lib/libalpm/add.c:663 #, c-format msgid "warning: %s installed as %s" msgstr "attenzione: %s installato come %s" -#: lib/libalpm/add.c:676 +#: lib/libalpm/add.c:677 #, c-format msgid "%s is in NoUpgrade -- skipping" msgstr "%s è in NoUpgrade -- verrà ignorato" -#: lib/libalpm/add.c:677 +#: lib/libalpm/add.c:678 #, c-format msgid "extracting %s as %s.pacnew" msgstr "estrazione di %s come %s.pacnew" -#: lib/libalpm/add.c:678 +#: lib/libalpm/add.c:679 #, c-format msgid "warning: extracting %s as %s.pacnew" msgstr "attenzione: estrazione in corso di %s come %s.pacnew" -#: lib/libalpm/add.c:681 +#: lib/libalpm/add.c:682 #, c-format msgid "extracting %s" msgstr "estrazione di %s in corso" -#: lib/libalpm/add.c:697 +#: lib/libalpm/add.c:698 #, c-format msgid "error: could not extract %s (%s)" msgstr "errore: impossibile estrarre %s (%s)" -#: lib/libalpm/add.c:709 +#: lib/libalpm/add.c:710 #, c-format msgid "appending backup entry for %s" msgstr "aggiunta in corso della voce di backup per %s" -#: lib/libalpm/add.c:741 lib/libalpm/add.c:743 +#: lib/libalpm/add.c:742 lib/libalpm/add.c:744 #, c-format msgid "errors occurred while %s %s" msgstr "si sono verificati degli errori durante %s %s" -#: lib/libalpm/add.c:742 lib/libalpm/add.c:744 +#: lib/libalpm/add.c:743 lib/libalpm/add.c:745 msgid "upgrading" msgstr "aggiornamento in corso" -#: lib/libalpm/add.c:742 lib/libalpm/add.c:744 +#: lib/libalpm/add.c:743 lib/libalpm/add.c:745 msgid "installing" msgstr "installazione in corso" -#: lib/libalpm/add.c:758 lib/libalpm/remove.c:321 +#: lib/libalpm/add.c:762 +#, c-format +msgid "provision '%s' has been removed from package %s (%s => %s)" +msgstr "'%s' è stata rimosso dal pacchetto %s (%s => %s)" + +#: lib/libalpm/add.c:772 +#, c-format +msgid "updating '%s' due to provision change (%s)" +msgstr "aggiornamento in corso di '%s' dovuto ad un cambiamento (%s)" + +#: lib/libalpm/add.c:775 lib/libalpm/add.c:776 +#, c-format +msgid "could not update provision '%s' from '%s'" +msgstr "impossibile aggiornare '%s' da '%s'" + +#: lib/libalpm/add.c:788 lib/libalpm/remove.c:321 msgid "updating database" msgstr "aggiornamento del database in corso" -#: lib/libalpm/add.c:759 +#: lib/libalpm/add.c:789 #, c-format msgid "adding database entry '%s'" msgstr "inclusione della voce '%s' nel database" -#: lib/libalpm/add.c:762 lib/libalpm/add.c:764 +#: lib/libalpm/add.c:792 lib/libalpm/add.c:794 #, c-format msgid "could not update database entry %s-%s" msgstr "impossibile aggiornare la voce %s-%s nel database" -#: lib/libalpm/add.c:770 +#: lib/libalpm/add.c:800 #, c-format msgid "could not add entry '%s' in cache" msgstr "impossible includere la voce '%s' nella cache" -#: lib/libalpm/add.c:798 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1054 +#: lib/libalpm/add.c:828 lib/libalpm/remove.c:341 lib/libalpm/sync.c:1054 #, c-format msgid "running \"ldconfig -r %s\"" msgstr "esecuzione in corso di \"ldconfig -r %s\"" @@ -514,25 +529,25 @@ msgid "cannot find '%s-%s' in db '%s'" msgstr "impossibile trovare '%s-%s' nel database '%s'" -#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:392 -#: lib/libalpm/be_files.c:415 lib/libalpm/be_files.c:503 -#: lib/libalpm/be_files.c:592 lib/libalpm/be_files.c:619 -#: lib/libalpm/package.c:196 +#: lib/libalpm/be_files.c:242 lib/libalpm/be_files.c:388 +#: lib/libalpm/be_files.c:411 lib/libalpm/be_files.c:502 +#: lib/libalpm/be_files.c:591 lib/libalpm/be_files.c:618 +#: lib/libalpm/package.c:197 #, c-format msgid "could not open file %s: %s" msgstr "impossibile aprire il file %s: %s" -#: lib/libalpm/be_files.c:500 +#: lib/libalpm/be_files.c:499 #, c-format msgid "writing %s-%s DESC information back to db" msgstr "scrittura in corso di %s-%s" -#: lib/libalpm/be_files.c:589 +#: lib/libalpm/be_files.c:588 #, c-format msgid "writing %s-%s FILES information back to db" msgstr "scrittura in corso di %s-%s" -#: lib/libalpm/be_files.c:616 +#: lib/libalpm/be_files.c:615 #, c-format msgid "writing %s-%s DEPENDS information back to db" msgstr "scrittura in corso di %s-%s" @@ -615,8 +630,8 @@ msgid "db vs targs: found %s as a conflict for %s" msgstr "db vs targs: trovato %s come conflitto per %s" -#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:587 -#: lib/libalpm/deps.c:627 lib/libalpm/group.c:43 lib/libalpm/handle.c:49 +#: lib/libalpm/conflict.c:296 lib/libalpm/deps.c:57 lib/libalpm/deps.c:623 +#: lib/libalpm/deps.c:663 lib/libalpm/group.c:43 lib/libalpm/handle.c:49 #: lib/libalpm/package.c:80 lib/libalpm/sync.c:65 lib/libalpm/sync.c:615 #: lib/libalpm/sync.c:631 lib/libalpm/sync.c:727 lib/libalpm/trans.c:52 #: lib/libalpm/util.c:607 lib/libalpm/util.c:614 @@ -629,30 +644,30 @@ msgid "malloc failed: could not allocate %d bytes" msgstr "malloc failed: impossibile allocare %d byte" -#: lib/libalpm/db.c:167 +#: lib/libalpm/db.c:165 msgid "attempt to re-register the 'local' DB" msgstr "tentativo in corso di registrare di nuovo il database 'locale'" -#: lib/libalpm/db.c:175 +#: lib/libalpm/db.c:173 #, c-format msgid "attempt to re-register the '%s' database, using existing" msgstr "" "tentativo in corso di registrare di nuovo il database '%s', usando quello " "esistente" -#: lib/libalpm/db.c:181 +#: lib/libalpm/db.c:179 #, c-format msgid "registering database '%s'" msgstr "registrazione del database '%s'" -#: lib/libalpm/db.c:186 +#: lib/libalpm/db.c:184 #, c-format msgid "database directory '%s' does not exist -- try creating it" msgstr "" "la directory del database '%s' non esiste -- verrà fatto un tentativo per " "crearla" -#: lib/libalpm/db.c:197 +#: lib/libalpm/db.c:195 #, c-format msgid "opening database '%s'" msgstr "apertura del database '%s' in corso" @@ -669,7 +684,7 @@ msgid "sorting dependencies finished" msgstr "ordinamento delle dipendenze terminato" -#: lib/libalpm/deps.c:220 lib/libalpm/deps.c:264 +#: lib/libalpm/deps.c:220 lib/libalpm/deps.c:300 msgid "null package found in package list" msgstr "nessun pacchetto trovato" @@ -678,51 +693,63 @@ msgid "cannot find package installed '%s'" msgstr "impossibile trovare il pacchetto installato '%s'" -#: lib/libalpm/deps.c:245 +#: lib/libalpm/deps.c:252 +#, c-format +msgid "checkdeps: dependency '%s' has moved from '%s' to '%s'" +msgstr "checkdeps: la dipendenza '%s' è stata spostata da '%s' a '%s'" + +#: lib/libalpm/deps.c:271 +#, c-format +msgid "checkdeps: dependency '%s' satisfied by installed package '%s'" +msgstr "checkdeps: dipendenza '%s' soddisfatta dal pacchetto '%s'" + +#: lib/libalpm/deps.c:280 #, c-format msgid "checkdeps: updated '%s' won't satisfy a dependency of '%s'" -msgstr "controllo delle dipendenze: il pacchetto aggiornato di '%s' non soddisfa una dipendenza di '%s'" +msgstr "" +"checkdeps: il pacchetto aggiornato di '%s' non soddisfa una " +"dipendenza di '%s'" -#: lib/libalpm/deps.c:272 +#: lib/libalpm/deps.c:308 #, c-format msgid "no dependencies for target '%s'" msgstr "nessuna dipendenza richiesta dal pacchetto '%s'" -#: lib/libalpm/deps.c:318 +#: lib/libalpm/deps.c:354 #, c-format msgid "missing dependency '%s' for package '%s'" msgstr "manca la dipendenza '%s' richiesta dal pacchetto '%s'" -#: lib/libalpm/deps.c:367 +#: lib/libalpm/deps.c:403 #, c-format msgid "checkdeps: found %s as required by %s" -msgstr "controllo delle dipendenze: trovato %s come richiesto da %s" +msgstr "checkdeps: trovato %s come richiesto da %s" -#: lib/libalpm/deps.c:441 +#: lib/libalpm/deps.c:477 #, c-format msgid "excluding %s -- explicitly installed" msgstr "esclusione di %s -- installato esplicitamente" -#: lib/libalpm/deps.c:488 +#: lib/libalpm/deps.c:524 #, c-format msgid "cannot find package \"%s\" or anything that provides it!" msgstr "impossibile trovare il pacchetto \"%s\" o qualcosa che lo fornisca!" -#: lib/libalpm/deps.c:497 lib/libalpm/deps.c:509 +#: lib/libalpm/deps.c:533 lib/libalpm/deps.c:545 #, c-format msgid "adding '%s' to the targets" msgstr "inclusione in corso di '%s' nei pacchetti" -#: lib/libalpm/deps.c:540 +#: lib/libalpm/deps.c:576 msgid "started resolving dependencies" msgstr "avvio risoluzione delle dipendenze" -#: lib/libalpm/deps.c:558 +#: lib/libalpm/deps.c:594 #, c-format msgid "%s provides dependency %s -- skipping" msgstr "%s fornisce la dipendenza %s -- verrà ignorato" -#: lib/libalpm/deps.c:583 +#: lib/libalpm/deps.c:619 #, c-format msgid "" "cannot resolve dependencies for \"%s\" (\"%s\" is not in the package set)" @@ -730,27 +757,27 @@ "impossibile risolvere le dipendenze per \"%s\" (\"%s\" non è presente nella " "lista dei pacchetti)" -#: lib/libalpm/deps.c:600 +#: lib/libalpm/deps.c:636 #, c-format msgid "dependency %s is already in the target list -- skipping" msgstr "la dipendenza %s è già nella lista dei pacchetti -- verrà ignorata" -#: lib/libalpm/deps.c:620 +#: lib/libalpm/deps.c:656 #, c-format msgid "pulling dependency %s (needed by %s)" msgstr "aggiunta la dipendenza %s (richiesta da %s)" -#: lib/libalpm/deps.c:624 +#: lib/libalpm/deps.c:660 #, c-format msgid "cannot resolve dependencies for \"%s\"" msgstr "impossibile risolvere le dipendenze per \"%s\"" -#: lib/libalpm/deps.c:640 +#: lib/libalpm/deps.c:676 #, c-format msgid "dependency cycle detected: %s" msgstr "individuato un possibile ciclo di dipendenze: %s" -#: lib/libalpm/deps.c:644 +#: lib/libalpm/deps.c:680 msgid "finished resolving dependencies" msgstr "risoluzione delle dipendenze terminata" @@ -998,49 +1025,54 @@ msgid "%s-%s: delaying upgrade of package (%s)" msgstr "%s-%s: ritardo durante l'aggiornamento del pacchetto (%s)" -#: lib/libalpm/package.c:210 lib/libalpm/package.c:269 +#: lib/libalpm/package.c:211 lib/libalpm/package.c:270 #, c-format msgid "%s: syntax error in description file line %d" msgstr "%s: errore di sintassi nel file di descrizione alla linea %d" -#: lib/libalpm/package.c:343 +#: lib/libalpm/package.c:344 msgid "could not parse the package description file" msgstr "impossibile analizzare il file di descrizione del pacchetto" -#: lib/libalpm/package.c:347 +#: lib/libalpm/package.c:348 #, c-format msgid "missing package name in %s" msgstr "manca il nome del pacchetto in %s" -#: lib/libalpm/package.c:351 +#: lib/libalpm/package.c:352 #, c-format msgid "missing package version in %s" msgstr "manca la versione del pacchetto in %s" -#: lib/libalpm/package.c:386 +#: lib/libalpm/package.c:387 #, c-format msgid "could not remove tempfile %s" msgstr "impossibile rimuovere il file temporaneo %s" -#: lib/libalpm/package.c:399 lib/libalpm/package.c:406 +#: lib/libalpm/package.c:400 lib/libalpm/package.c:407 #, c-format msgid "error while reading package: %s" msgstr "si è verificato un errore durante la lettura del pacchetto: %s" -#: lib/libalpm/package.c:412 +#: lib/libalpm/package.c:413 msgid "missing package metadata" msgstr "manca il metadata del pacchetto" -#: lib/libalpm/package.c:419 +#: lib/libalpm/package.c:420 #, c-format msgid "missing package filelist in %s, generating one" msgstr "manca il filelist nel pacchetto %s, creazione in corso" -#: lib/libalpm/package.c:547 +#: lib/libalpm/package.c:552 #, c-format msgid "adding '%s' in requiredby field for '%s'" msgstr "inclusione di '%s' nel campo 'richiesto da' di '%s'" +#: lib/libalpm/package.c:561 +#, c-format +msgid "adding '%s' in requiredby field for '%s' (provides: %s)" +msgstr "inclusione di '%s' nel campo 'richiesto da' di '%s' (fornisce: %s)" + #: lib/libalpm/remove.c:78 #, c-format msgid "could not find %s in database" @@ -1344,20 +1376,25 @@ msgstr "impossibile aggiornare la nuova voce del database %s-%s" #: lib/libalpm/trans.c:262 -msgid "updating dependency packages 'requiredby' fields" -msgstr "aggiornamento delle dipendenze nei campi 'richiesto da'" +#, c-format +msgid "updating dependency packages 'requiredby' fields for %s-%s" +msgstr "aggiornamento delle dipendenze nei campi 'richiesto da' di %s-%s" + +#: lib/libalpm/trans.c:265 +msgid "package has no dependencies, no other packages to update" +msgstr "il pacchetto non ha dipendenze, nessun altro pacchetto da aggiornare" -#: lib/libalpm/trans.c:299 lib/libalpm/trans.c:323 +#: lib/libalpm/trans.c:302 lib/libalpm/trans.c:326 #, c-format msgid "updating 'requiredby' field for package '%s'" msgstr "aggiornamento in corso del campo 'richiesto da' del pacchetto '%s'" -#: lib/libalpm/trans.c:309 lib/libalpm/trans.c:333 +#: lib/libalpm/trans.c:312 lib/libalpm/trans.c:336 #, c-format msgid "could not update 'requiredby' database entry %s-%s" msgstr "impossibile aggiornare la voce 'richiesto da' del database %s-%s" -#: lib/libalpm/trans.c:315 +#: lib/libalpm/trans.c:318 #, c-format msgid "could not find dependency '%s'" msgstr "impossibile trovare la dipendenza '%s'"

1 0

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

01 Mar '07

Date: Thursday, March 1, 2007 @ 14:07:39 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: lib/libalpm/alpm.c (1.120 -> 1.121) lib/libalpm/alpm_list.c (1.7 -> 1.8) lib/libalpm/cache.c (1.35 -> 1.36) lib/libalpm/db.h (1.27 -> 1.28) lib/libalpm/package.c (1.80 -> 1.81) lib/libalpm/sync.c (1.105 -> 1.106) pactest/pmenv.py (1.8 -> 1.9) * Modified values of INFRQ_* options so we start at 0x01 and not 0x00. This allows for the same bit operators to be used across the board on pkg_get operations. * Changed name of INFRQ_NONE -> INFRQ_BASE to more clearly reflect what it does (loads pkg name and version). * Added a few missing things on package functions, such as SYMEXPORT and ALPM_LOG_FUNC. * Slight updates to pmenv to print 'pass' and 'fail' instead of 'passed' and 'failed'. Keeps output a bit more concise. * Fixed a doxygen comment spelling error. :P -------------------------+ lib/libalpm/alpm.c | 8 ++++---- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/cache.c | 4 ++-- lib/libalpm/db.h | 10 +++++----- lib/libalpm/package.c | 24 +++++++++++++++++++++--- lib/libalpm/sync.c | 4 ++-- pactest/pmenv.py | 18 +++++++++--------- 7 files changed, 44 insertions(+), 26 deletions(-) Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.120 pacman-lib/lib/libalpm/alpm.c:1.121 --- pacman-lib/lib/libalpm/alpm.c:1.120 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/alpm.c Thu Mar 1 14:07:38 2007 @@ -303,7 +303,7 @@ /* remove the old dir */ _alpm_log(PM_LOG_DEBUG, _("flushing database %s/%s"), handle->dbpath, db->treename); - for(lp = _alpm_db_get_pkgcache(db, INFRQ_NONE); lp; lp = lp->next) { + for(lp = _alpm_db_get_pkgcache(db, INFRQ_BASE); lp; lp = lp->next) { if(_alpm_db_remove(db, lp->data) == -1) { if(lp->data) { _alpm_log(PM_LOG_ERROR, _("could not remove database entry %s/%s"), db->treename, @@ -354,7 +354,7 @@ ASSERT(handle != NULL, return(NULL)); ASSERT(db != NULL, return(NULL)); - return(_alpm_db_get_pkgcache(db, INFRQ_NONE)); + return(_alpm_db_get_pkgcache(db, INFRQ_BASE)); } /** Get the list of packages that a package provides @@ -1085,7 +1085,7 @@ pmpkg_t *spkg = j->data; for(k = spkg->replaces; k; k = k->next) { alpm_list_t *m; - for(m = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); m; m = m->next) { + for(m = _alpm_db_get_pkgcache(handle->db_local, INFRQ_BASE); m; m = m->next) { 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); @@ -1135,7 +1135,7 @@ } /* now do normal upgrades */ - for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { + for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_BASE); i; i = i->next) { int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; Index: pacman-lib/lib/libalpm/alpm_list.c diff -u pacman-lib/lib/libalpm/alpm_list.c:1.7 pacman-lib/lib/libalpm/alpm_list.c:1.8 --- pacman-lib/lib/libalpm/alpm_list.c:1.7 Thu Mar 1 02:03:05 2007 +++ pacman-lib/lib/libalpm/alpm_list.c Thu Mar 1 14:07:39 2007 @@ -462,7 +462,7 @@ * @note Entries are not duplicated * @param lhs the first list * @param rhs the second list - * @param fn the comparisson function + * @param fn the comparison function * @return a list containing all items in lhs not present in rhs */ alpm_list_t *alpm_list_diff(alpm_list_t *lhs, alpm_list_t *rhs, alpm_list_fn_cmp fn) Index: pacman-lib/lib/libalpm/cache.c diff -u pacman-lib/lib/libalpm/cache.c:1.35 pacman-lib/lib/libalpm/cache.c:1.36 --- pacman-lib/lib/libalpm/cache.c:1.35 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/cache.c Thu Mar 1 14:07:39 2007 @@ -123,7 +123,7 @@ alpm_list_t *p; for(p = db->pkgcache; p; p = p->next) { pmpkg_t *pkg = (pmpkg_t *)p->data; - if(infolevel != INFRQ_NONE && !(pkg->infolevel & infolevel)) { + if(infolevel != INFRQ_BASE && !(pkg->infolevel & infolevel)) { 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); @@ -195,7 +195,7 @@ return(NULL); } - alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db, INFRQ_NONE); + alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db, INFRQ_BASE); if(!pkgcache) { _alpm_log(PM_LOG_DEBUG, _("error: failed to get '%s' from NULL pkgcache"), target); return(NULL); Index: pacman-lib/lib/libalpm/db.h diff -u pacman-lib/lib/libalpm/db.h:1.27 pacman-lib/lib/libalpm/db.h:1.28 --- pacman-lib/lib/libalpm/db.h:1.27 Wed Feb 28 22:08:41 2007 +++ pacman-lib/lib/libalpm/db.h Thu Mar 1 14:07:39 2007 @@ -28,11 +28,11 @@ /* Database entries */ typedef enum _pmdbinfrq_t { - INFRQ_NONE = 0x00, - INFRQ_DESC = 0x01, - INFRQ_DEPENDS = 0x02, - INFRQ_FILES = 0x04, - INFRQ_SCRIPTLET = 0x08, + INFRQ_BASE = 0x01, + INFRQ_DESC = 0x02, + INFRQ_DEPENDS = 0x04, + INFRQ_FILES = 0x08, + INFRQ_SCRIPTLET = 0x16, INFRQ_ALL = 0xFF } pmdbinfrq_t; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.80 pacman-lib/lib/libalpm/package.c:1.81 --- pacman-lib/lib/libalpm/package.c:1.80 Thu Mar 1 00:42:53 2007 +++ pacman-lib/lib/libalpm/package.c Thu Mar 1 14:07:39 2007 @@ -567,7 +567,7 @@ } } -const char *alpm_pkg_get_filename(pmpkg_t *pkg) +const char SYMEXPORT *alpm_pkg_get_filename(pmpkg_t *pkg) { ALPM_LOG_FUNC; @@ -577,10 +577,15 @@ if(!strlen(pkg->filename)) { /* construct the file name, it's not in the desc file */ + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_DESC)) { + _alpm_db_read(pkg->data, pkg, INFRQ_DESC); + } if(pkg->arch && strlen(pkg->arch) > 0) { - snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s-%s" PM_EXT_PKG, pkg->name, pkg->version, pkg->arch); + snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s-%s" PM_EXT_PKG, + pkg->name, pkg->version, pkg->arch); } else { - snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s" PM_EXT_PKG, pkg->name, pkg->version); + snprintf(pkg->filename, PKG_FILENAME_LEN, "%s-%s" PM_EXT_PKG, + pkg->name, pkg->version); } } @@ -589,19 +594,29 @@ const char SYMEXPORT *alpm_pkg_get_name(pmpkg_t *pkg) { + ALPM_LOG_FUNC; + /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) { + _alpm_db_read(pkg->data, pkg, INFRQ_BASE); + } return pkg->name; } const char SYMEXPORT *alpm_pkg_get_version(pmpkg_t *pkg) { + ALPM_LOG_FUNC; + /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); + if(pkg->origin == PKG_FROM_CACHE && !(pkg->infolevel & INFRQ_BASE)) { + _alpm_db_read(pkg->data, pkg, INFRQ_BASE); + } return pkg->version; } @@ -649,6 +664,8 @@ const char SYMEXPORT *alpm_pkg_get_buildtype(pmpkg_t *pkg) { + ALPM_LOG_FUNC; + /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); ASSERT(pkg != NULL, return(NULL)); @@ -929,6 +946,7 @@ return pkg->scriptlet; } +/* TODO this should either be public, or done somewhere else */ int _alpm_pkg_istoonew(pmpkg_t *pkg) { time_t t; Index: pacman-lib/lib/libalpm/sync.c diff -u pacman-lib/lib/libalpm/sync.c:1.105 pacman-lib/lib/libalpm/sync.c:1.106 --- pacman-lib/lib/libalpm/sync.c:1.105 Mon Feb 26 03:38:48 2007 +++ pacman-lib/lib/libalpm/sync.c Thu Mar 1 14:07:39 2007 @@ -137,7 +137,7 @@ for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) { const char *replacement = k->data; /* compare to local DB */ - for(m = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); m; m = m->next) { + for(m = _alpm_db_get_pkgcache(db_local, INFRQ_BASE); m; m = m->next) { pmpkg_t *lpkg = m->data; if(strcmp(replacement, lpkg->name) == 0) { @@ -203,7 +203,7 @@ 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")); - for(i = _alpm_db_get_pkgcache(db_local, INFRQ_NONE); i; i = i->next) { + for(i = _alpm_db_get_pkgcache(db_local, INFRQ_BASE); i; i = i->next) { int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; Index: pacman-lib/pactest/pmenv.py diff -u pacman-lib/pactest/pmenv.py:1.8 pacman-lib/pactest/pmenv.py:1.9 --- pacman-lib/pactest/pmenv.py:1.8 Wed Feb 28 11:37:24 2007 +++ pacman-lib/pactest/pmenv.py Thu Mar 1 14:07:39 2007 @@ -80,9 +80,9 @@ t.check() print "==> Test result" if t.result["fail"] == 0: - print "\tPASSED" + print "\tPASS" else: - print "\tFAILED" + print "\tFAIL" print def results(self): @@ -104,16 +104,16 @@ fail = test.result["fail"] rules = len(test.rules) if fail == 0: - result = "[PASSED]" + result = "[PASS]" else: - result = "[FAILED]" + result = "[FAIL]" print result, print "%s Rules: OK = %2u FAIL = %2u SKIP = %2u" \ - % (test.testname.ljust(32), success, fail, \ + % (test.testname.ljust(34), success, fail, \ rules - (success + fail)) if fail != 0: # print test description if test failed - print " ", test.description + print " ", test.description print "=========="*8 print "Results" @@ -125,10 +125,10 @@ total = len(self.testcases) failed = total - passed - print "TOTAL = %3u" % total + 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 "PASS = %3u (%6.2f%%)" % (passed, float(passed) * 100 / total) + print "FAIL = %3u (%6.2f%%)" % (failed, float(failed) * 100 / total) print "" if __name__ == "__main__":

1 0