- Pacman-dev - lists.archlinux.org

[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