- Pacman-dev - lists.archlinux.org

[pacman-dev] Fwd: FS#6378: pacman 3: output issues
by Dan McGee 09 Feb '07

09 Feb '07

> FS#6378 - pacman 3: output issues > User who did this: - Roman Kyrylych (Romashka) > > ---------- > 1) I meant that it would be nice to have output like 2,0M -> 2,3M -> > 2,7M -> 3,2M, than just 2M -> 3M That is what the int -> float change does, if you know the C language types- it allows decimal places. > 2) I don't understand what you mean by "translate from language to > language" :-/ Does "..." mean "name continues but it is too long" in all languages? Of course, gettext should be able to translate this string, but the original question still stands if there is a punctuation mark in all languages used for the same purpose the English "..." is. -Dan

2 1

Re: [pacman-dev] FS#6316: Pacman 3 release bugcatcher
by Dan McGee 09 Feb '07

09 Feb '07

> The following task has a new comment added: > > FS#6316 - Pacman 3 release bugcatcher > User who did this: - Roman Kyrylych (Romashka) > > ---------- > I added Total Download Size feature request because it can be > implemented along with other output fixes/changes. > ---------- > > More information can be found at the following URL: > http://bugs.archlinux.org/task/6316#comment14228 Roman, the problem with this is it truely is a feature request- it may not be that easy to add at this point in the development cycle. I believe when the other sizes are presented, we have done nothing yet to see if those packages are cached or not, so thus do not know the actual download size. It may have to wait for pacman 3.1. -Dan

3 2

[pacman-dev] pacman3 backup=()
by Roman Kyrylych 09 Feb '07

09 Feb '07

Please add all needed files to backup array for next RC. I often use local mirror and had to modify pacman3.conf few times. -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] CVS update of pacman-lib/etc/pacman.d (gen-mirrorlist.sh)
by Juergen Hoetzel 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 17:09:28 Author: juergen Path: /home/cvs-pacman/pacman-lib/etc/pacman.d Removed: gen-mirrorlist.sh (1.1) * gen-mirrorlist.sh not needed anymore -------------------+ gen-mirrorlist.sh | 12 ------------ 1 file changed, 12 deletions(-) Index: pacman-lib/etc/pacman.d/gen-mirrorlist.sh diff -u pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 pacman-lib/etc/pacman.d/gen-mirrorlist.sh:removed --- pacman-lib/etc/pacman.d/gen-mirrorlist.sh:1.1 Thu Dec 28 11:54:35 2006 +++ pacman-lib/etc/pacman.d/gen-mirrorlist.sh Fri Feb 9 17:09:28 2007 @@ -1,12 +0,0 @@ -#!/bin/bash -# gen-mirrorlist.sh -# There's absolutely no way to make autoconf do this, so instead, autoconf will -# call this script - simple enough. - - -REPOS="current extra unstable release community" - -for i in $REPOS; do - rm -f $i - cat mirrorlist | sed "s|@@REPO@@|$i|g" > $i -done

1 0

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

09 Feb '07

Date: Friday, February 9, 2007 @ 16:54:58 Author: dan Path: /home/cvs-pacman/pacman-lib Modified: .cvsignore (1.3 -> 1.4) doc/.cvsignore (1.1 -> 1.2) lib/libalpm/alpm.c (1.114 -> 1.115) lib/libalpm/package.c (1.64 -> 1.65) lib/libalpm/po/.cvsignore (1.2 -> 1.3) lib/libalpm/versioncmp.h (1.7 -> 1.8) src/pacman/po/.cvsignore (1.2 -> 1.3) src/util/.cvsignore (1.1 -> 1.2) * Fix compile errors/warnings. * Update .cvsignore files a bit. ---------------------------+ .cvsignore | 3 +++ doc/.cvsignore | 3 +-- lib/libalpm/alpm.c | 1 - lib/libalpm/package.c | 3 ++- lib/libalpm/po/.cvsignore | 2 -- lib/libalpm/versioncmp.h | 2 +- src/pacman/po/.cvsignore | 2 -- src/util/.cvsignore | 1 - 8 files changed, 7 insertions(+), 10 deletions(-) Index: pacman-lib/.cvsignore diff -u pacman-lib/.cvsignore:1.3 pacman-lib/.cvsignore:1.4 --- pacman-lib/.cvsignore:1.3 Wed Jan 24 03:51:50 2007 +++ pacman-lib/.cvsignore Fri Feb 9 16:54:57 2007 @@ -16,3 +16,6 @@ ltmain.sh missing stamp-h1 + +tags +cscope.out Index: pacman-lib/doc/.cvsignore diff -u pacman-lib/doc/.cvsignore:1.1 pacman-lib/doc/.cvsignore:1.2 --- pacman-lib/doc/.cvsignore:1.1 Mon Mar 27 12:17:35 2006 +++ pacman-lib/doc/.cvsignore Fri Feb 9 16:54:57 2007 @@ -1,4 +1,3 @@ Makefile Makefile.in -*.3 -*.8 +man3 Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.114 pacman-lib/lib/libalpm/alpm.c:1.115 --- pacman-lib/lib/libalpm/alpm.c:1.114 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/alpm.c Fri Feb 9 16:54:57 2007 @@ -1146,7 +1146,6 @@ /* now do normal upgrades */ for(i = _alpm_db_get_pkgcache(handle->db_local, INFRQ_NONE); i; i = i->next) { - int cmp; int replace=0; pmpkg_t *local = i->data; pmpkg_t *spkg = NULL; Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.64 pacman-lib/lib/libalpm/package.c:1.65 --- pacman-lib/lib/libalpm/package.c:1.64 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 9 16:54:57 2007 @@ -31,13 +31,14 @@ #include <locale.h> #include <errno.h> /* pacman */ +#include "package.h" #include "log.h" #include "util.h" #include "error.h" #include "alpm_list.h" -#include "package.h" #include "db.h" #include "handle.h" +#include "versioncmp.h" #include "alpm.h" pmpkg_t *_alpm_pkg_new(const char *name, const char *version) Index: pacman-lib/lib/libalpm/po/.cvsignore diff -u pacman-lib/lib/libalpm/po/.cvsignore:1.2 pacman-lib/lib/libalpm/po/.cvsignore:1.3 --- pacman-lib/lib/libalpm/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/lib/libalpm/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.7 pacman-lib/lib/libalpm/versioncmp.h:1.8 --- pacman-lib/lib/libalpm/versioncmp.h:1.7 Fri Feb 9 16:08:10 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Fri Feb 9 16:54:57 2007 @@ -27,7 +27,7 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -int _alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b); #endif Index: pacman-lib/src/pacman/po/.cvsignore diff -u pacman-lib/src/pacman/po/.cvsignore:1.2 pacman-lib/src/pacman/po/.cvsignore:1.3 --- pacman-lib/src/pacman/po/.cvsignore:1.2 Thu Feb 8 00:36:26 2007 +++ pacman-lib/src/pacman/po/.cvsignore Fri Feb 9 16:54:57 2007 @@ -3,6 +3,4 @@ *.gmo POTFILES stamp-po - -remove-potcdate.sin remove-potcdate.sed Index: pacman-lib/src/util/.cvsignore diff -u pacman-lib/src/util/.cvsignore:1.1 pacman-lib/src/util/.cvsignore:1.2 --- pacman-lib/src/util/.cvsignore:1.1 Mon Mar 27 12:17:36 2006 +++ pacman-lib/src/util/.cvsignore Fri Feb 9 16:54:58 2007 @@ -2,5 +2,4 @@ .libs Makefile Makefile.in -convertdb vercmp

1 0

[pacman-dev] CVS update of pacman-lib/src/util (vercmp.c)
by Aaron Griffin 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 16:08:12 Author: aaron Path: /home/cvs-pacman/pacman-lib/src/util Modified: vercmp.c (1.6 -> 1.7) * I made "alpm_versioncmp" public a while back, without noticing this was already done (alpm_pkg_vercmp). I dropped this change, making versioncmp "private" again. (alpm_versioncmp -> _alpm_versioncmp, hidden symbol) * Make alpm_get_upgrades use the same version check that -Su and -S use. ----------+ vercmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: pacman-lib/src/util/vercmp.c diff -u pacman-lib/src/util/vercmp.c:1.6 pacman-lib/src/util/vercmp.c:1.7 --- pacman-lib/src/util/vercmp.c:1.6 Tue Jan 30 02:47:20 2007 +++ pacman-lib/src/util/vercmp.c Fri Feb 9 16:08:12 2007 @@ -45,7 +45,7 @@ return(0); } - ret = alpm_versioncmp(s1, s2); + ret = alpm_pkg_vercmp(s1, s2); printf("%d\n", ret); return(ret); }

1 0

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

09 Feb '07

Date: Friday, February 9, 2007 @ 16:08:11 Author: aaron Path: /home/cvs-pacman/pacman-lib/lib/libalpm Modified: add.c (1.110 -> 1.111) alpm.c (1.113 -> 1.114) alpm.h (1.74 -> 1.75) package.c (1.63 -> 1.64) versioncmp.c (1.12 -> 1.13) versioncmp.h (1.6 -> 1.7) * I made "alpm_versioncmp" public a while back, without noticing this was already done (alpm_pkg_vercmp). I dropped this change, making versioncmp "private" again. (alpm_versioncmp -> _alpm_versioncmp, hidden symbol) * Make alpm_get_upgrades use the same version check that -Su and -S use. --------------+ add.c | 4 ++-- alpm.c | 22 ++-------------------- alpm.h | 3 --- package.c | 2 +- versioncmp.c | 6 +++--- versioncmp.h | 2 ++ 6 files changed, 10 insertions(+), 29 deletions(-) Index: pacman-lib/lib/libalpm/add.c diff -u pacman-lib/lib/libalpm/add.c:1.110 pacman-lib/lib/libalpm/add.c:1.111 --- pacman-lib/lib/libalpm/add.c:1.110 Wed Jan 31 21:29:07 2007 +++ pacman-lib/lib/libalpm/add.c Fri Feb 9 16:08:10 2007 @@ -158,7 +158,7 @@ if(trans->flags & PM_TRANS_FLAG_FRESHEN) { /* only upgrade/install this package if it is already installed and at a lesser version */ dummy = _alpm_db_get_pkgfromcache(db, pkgname); - if(dummy == NULL || alpm_versioncmp(dummy->version, pkgver) >= 0) { + if(dummy == NULL || _alpm_versioncmp(dummy->version, pkgver) >= 0) { pm_errno = PM_ERR_PKG_CANT_FRESH; goto error; } @@ -170,7 +170,7 @@ for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = i->data; if(strcmp(pkg->name, pkgname) == 0) { - if(alpm_versioncmp(pkg->version, pkgver) < 0) { + if(_alpm_versioncmp(pkg->version, pkgver) < 0) { pmpkg_t *newpkg; _alpm_log(PM_LOG_WARNING, _("replacing older version %s-%s by %s in target list"), pkg->name, pkg->version, pkgver); Index: pacman-lib/lib/libalpm/alpm.c diff -u pacman-lib/lib/libalpm/alpm.c:1.113 pacman-lib/lib/libalpm/alpm.c:1.114 --- pacman-lib/lib/libalpm/alpm.c:1.113 Wed Feb 7 17:08:37 2007 +++ pacman-lib/lib/libalpm/alpm.c Fri Feb 9 16:08:10 2007 @@ -561,7 +561,7 @@ { ALPM_LOG_FUNC; - return(alpm_versioncmp(ver1, ver2)); + return(_alpm_versioncmp(ver1, ver2)); } /* internal */ @@ -1175,25 +1175,7 @@ continue; } - /* compare versions and see if we need to upgrade */ - cmp = alpm_versioncmp(local->version, spkg->version); - if(cmp > 0 && !spkg->force) { - /* local version is newer */ - pmdb_t *db = spkg->data; - _alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)"), - local->name, local->version, db->treename, spkg->version); - } else if(cmp == 0) { - /* versions are identical */ - } else if(alpm_list_find_str(handle->ignorepkg, spkg->name)) { - /* package should be ignored (IgnorePkg) */ - _alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (%s)"), - local->name, local->version, spkg->version); - } else if(_alpm_pkg_istoonew(spkg)) { - /* package too new (UpgradeDelay) */ - _alpm_log(PM_LOG_DEBUG, _("%s-%s: delaying upgrade of package (%s)"), - local->name, local->version, spkg->version); - /* check if spkg->name is already in the packages list. */ - } else { + if(alpm_pkg_compare_versions(local, spkg)) { _alpm_log(PM_LOG_DEBUG, _("%s-%s elected for upgrade (%s => %s)"), local->name, local->version, local->version, spkg->version); alpm_list_t *s; Index: pacman-lib/lib/libalpm/alpm.h diff -u pacman-lib/lib/libalpm/alpm.h:1.74 pacman-lib/lib/libalpm/alpm.h:1.75 --- pacman-lib/lib/libalpm/alpm.h:1.74 Fri Feb 9 11:02:20 2007 +++ pacman-lib/lib/libalpm/alpm.h Fri Feb 9 16:08:10 2007 @@ -482,9 +482,6 @@ char *alpm_strerror(int err); -/* Version Compare */ -int alpm_versioncmp(const char *a, const char *b); - alpm_list_t *alpm_get_upgrades(); #ifdef __cplusplus Index: pacman-lib/lib/libalpm/package.c diff -u pacman-lib/lib/libalpm/package.c:1.63 pacman-lib/lib/libalpm/package.c:1.64 --- pacman-lib/lib/libalpm/package.c:1.63 Wed Feb 7 01:12:53 2007 +++ pacman-lib/lib/libalpm/package.c Fri Feb 9 16:08:10 2007 @@ -135,7 +135,7 @@ } /* compare versions and see if we need to upgrade */ - cmp = alpm_versioncmp(local_pkg->version, pkg->version); + cmp = _alpm_versioncmp(local_pkg->version, pkg->version); if(cmp != 0 && pkg->force) { cmp = 1; Index: pacman-lib/lib/libalpm/versioncmp.c diff -u pacman-lib/lib/libalpm/versioncmp.c:1.12 pacman-lib/lib/libalpm/versioncmp.c:1.13 --- pacman-lib/lib/libalpm/versioncmp.c:1.12 Tue Jan 30 03:14:11 2007 +++ pacman-lib/lib/libalpm/versioncmp.c Fri Feb 9 16:08:10 2007 @@ -148,7 +148,7 @@ #endif /* this function was taken from rpm 4.0.4 and rewritten */ -int SYMEXPORT alpm_versioncmp(const char *a, const char *b) +int _alpm_versioncmp(const char *a, const char *b) { char str1[64], str2[64]; char *ptr1, *ptr2; @@ -238,7 +238,7 @@ if((!*one) && (!*two)) { /* compare release numbers */ - if(rel1 && rel2) return(alpm_versioncmp(rel1, rel2)); + if(rel1 && rel2) return(_alpm_versioncmp(rel1, rel2)); return(0); } @@ -256,7 +256,7 @@ if(dep->mod == PM_DEP_MOD_ANY) { equal = 1; } else { - int cmp = alpm_versioncmp(pkg->version, dep->version); + int cmp = _alpm_versioncmp(pkg->version, dep->version); switch(dep->mod) { case PM_DEP_MOD_EQ: equal = (cmp == 0); break; case PM_DEP_MOD_GE: equal = (cmp >= 0); break; Index: pacman-lib/lib/libalpm/versioncmp.h diff -u pacman-lib/lib/libalpm/versioncmp.h:1.6 pacman-lib/lib/libalpm/versioncmp.h:1.7 --- pacman-lib/lib/libalpm/versioncmp.h:1.6 Tue Jan 30 02:47:20 2007 +++ pacman-lib/lib/libalpm/versioncmp.h Fri Feb 9 16:08:10 2007 @@ -27,6 +27,8 @@ #include "package.h" int _alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); +int _alpm_versioncmp(const char *a, const char *b) + #endif

1 0

[pacman-dev] CVS update of pacman-lib/scripts (makepkg)
by Aaron Griffin 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 14:16:15 Author: aaron Path: /home/cvs-pacman/pacman-lib/scripts Modified: makepkg (1.46 -> 1.47) * Fix #2982 - use -Rs to remove deps * "pacman3" seems to have snuck in there somehow, fixed that ---------+ makepkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: pacman-lib/scripts/makepkg diff -u pacman-lib/scripts/makepkg:1.46 pacman-lib/scripts/makepkg:1.47 --- pacman-lib/scripts/makepkg:1.46 Thu Feb 8 00:24:18 2007 +++ pacman-lib/scripts/makepkg Fri Feb 9 14:16:15 2007 @@ -306,7 +306,7 @@ removedeps() { if [ "$RMDEPS" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then msg "Removing installed dependencies..." - pacman3 $PACMAN_OPTS -R $makedeplist $deplist + pacman $PACMAN_OPTS -Rs $makedeplist $deplist # fixes bug #6215 elif [ "$RMDEPS" = "1" -a "$DEP_SUDO" = "1" -a $ ! -z "$deplist" -o ! -z "$makedeplist" $ ]; then msg "Removing installed dependencies..." @@ -314,7 +314,7 @@ export FAKEROOTKEY2=$FAKEROOTKEY unset FAKEROOTKEY fi - sudo pacman3 $PACMAN_OPTS -R $makedeplist $deplist + sudo pacman $PACMAN_OPTS -Rs $makedeplist $deplist if [ "$INFAKEROOT" = "1" ]; then export FAKEROOTKEY=$FAKEROOTKEY2 unset FAKEROOTKEY2

1 0

[pacman-dev] CVS update of pacman-lib/doc (Makefile.am)
by dan＠archlinux.org 09 Feb '07

09 Feb '07

Date: Friday, February 9, 2007 @ 13:37:27 Author: dan Path: /home/cvs-pacman/pacman-lib/doc Modified: Makefile.am (1.12 -> 1.13) New manpages were going nowhere without an updated makefile -------------+ Makefile.am | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) Index: pacman-lib/doc/Makefile.am diff -u pacman-lib/doc/Makefile.am:1.12 pacman-lib/doc/Makefile.am:1.13 --- pacman-lib/doc/Makefile.am:1.12 Wed Feb 7 17:29:21 2007 +++ pacman-lib/doc/Makefile.am Fri Feb 9 13:37:27 2007 @@ -1,14 +1,21 @@ -all: makepkg.8 PKGBUILD.5 pacman.8 +all: makepkg.8 pacman.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 if HAS_MAN2HTML makepkg.8: man2html makepkg.8 > html/makepkg.8.html +pacman.8: + man2html pacman.8 > html/pacman.8.html + PKGBUILD.5: man2html PKGBUILD.5 > html/PKGBUILD.5.html -pacman.8: - man2html pacman.8 > html/pacman.8.html +makepkg.conf.5: + man2html makepkg.8 > html/makepkg.8.html + +pacman.conf.5: + man2html pacman.conf.5 > html/pacman.conf.5.html + endif clean: @@ -17,7 +24,7 @@ rm -f man5/*.5 rm -f man8/*.8 -man_MANS = pacman.8 makepkg.8 PKGBUILD.5 libalpm.3 +man_MANS = pacman.8 makepkg.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 libalpm.3 if HAS_DOXYGEN man_MANS += *.3

1 0

[pacman-dev] Bug #5775
by Roman Kyrylych 09 Feb '07

09 Feb '07

Bug #5775 is not fixed! Sad, but true. :( I did clean 0.8 beta1 install under vmware, mounted my local mirror, installed pacman-rc, but all was _exactly_ the same as reported here: http://bugs.archlinux.org/task/5775#comment12437 The _only_ difference is that -Rs worked without errors. Then I removed /var/lib/pacman/current (just to be sure that it wasn't corrupted ny pacman2 when doing first -Syu after install), but syncing repo with pacman3 still results in broken db and problem with xorg-res-utils. -- Roman Kyrylych (Роман Кирилич)

5 15