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

[pacman-dev] dependency code refactoring : search for satisfier
by Xavier 17 Jul '07

17 Jul '07

I've been trying to think about this, how that common search for satisfier code could be refactored, but it's less obvious than I thought. The main problem is that there are many different use cases. First the places where we are looking for satisfier : 1) the whole local database 2) a list of targets 3) local database except a list of targets 4) all sync repos And then there is the result we want : 1) just the first satisfier 2) the actual package if it exists, otherwise the first provider 3) the list of all satisfiers 4) just to know if at least one satisfier exists So by combining all these, that's quite a lot of use cases. Maybe there should be a set of functions for the most common cases or something. Anyway, I didn't really find a proper way yet.

1 0

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-316-g466d289
by Dan McGee 16 Jul '07

16 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 466d289e6a3e7dbaf567b39485c49d67eac5b362 (commit) via fa2164a59ecc47a7a4324712710c367e195f14f6 (commit) via 99572ed8f6f585e5b6ee4c9300b0589b2c75c54a (commit) via ab2354e762767e6088e43b6d1e615576701a7bdb (commit) via 1d97da9450c4fc62dd884f356d67d7a746fc09da (commit) from 591bfabbd38bf4f8f209977f416a4e5fd3cc2baf (commit) - Log ----------------------------------------------------------------- commit 466d289e6a3e7dbaf567b39485c49d67eac5b362 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Jul 16 16:49:28 2007 -0400 Remove unnecessary entries from .gitignore files .gitignore works recursively, so we don't need Makefile and Makefile.in in all of the subdirectory .gitignore files. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa2164a59ecc47a7a4324712710c367e195f14f6 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 16 21:31:54 2007 +0200 Use only one mirror list for all repos Fully implement what this commit allows: ebad1996149d72cf4a1fe15fe8326f2b4996f585 Dan: update .gitignore as well. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 99572ed8f6f585e5b6ee4c9300b0589b2c75c54a Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 16 14:08:48 2007 +0200 new pmdepend_t / pmdepmissing_t accessors. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ab2354e762767e6088e43b6d1e615576701a7bdb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon Jul 16 11:30:55 2007 +0200 Add remove046 pactest for FS#7622. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 1d97da9450c4fc62dd884f356d67d7a746fc09da Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 15 22:31:29 2007 -0400 makepkg: Add note with some required programs for execution Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: contrib/.gitignore | 2 - doc/.gitignore | 2 - etc/.gitignore | 2 - etc/pacman.conf.in | 10 ++-- etc/pacman.d/.gitignore | 9 +---- etc/pacman.d/Makefile.am | 10 +---- etc/pacman.d/mirrorlist.in | 90 ++++++++++++++++++++++---------------------- lib/libalpm/.gitignore | 2 - lib/libalpm/alpm.h | 13 +++--- lib/libalpm/deps.c | 30 +++++++------- lib/libalpm/po/.gitignore | 2 - pactest/.gitignore | 3 - pactest/tests/remove046.py | 10 +++++ po/.gitignore | 2 - scripts/makepkg.sh.in | 5 ++ src/pacman/.gitignore | 2 - src/pacman/add.c | 16 ++++--- src/pacman/deptest.c | 4 +- src/pacman/remove.c | 5 +- src/pacman/sync.c | 17 ++++---- src/util/.gitignore | 2 - 21 files changed, 113 insertions(+), 125 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 591bfabbd38bf4f8f209977f416a4e5fd3cc2baf \ 466d289e6a3e7dbaf567b39485c49d67eac5b362

1 0

[pacman-dev] Mirror lists
by Xavier 16 Jul '07

16 Jul '07

So Aaron made a patch a while ago that allows to use only one file for mirrors : http://bugs.archlinux.org/task/6389#comment16438 any chance the pacman git tree could take advantage of this feature ? I think the whole pacman.d/ could be removed. Maybe with something like this: >From 9e4f79548b27f2de60d510b715bebd68bcb3992a Mon Sep 17 00:00:00 2001 From: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon, 16 Jul 2007 21:31:54 +0200 Subject: [PATCH] Uses only one mirror list for all repos. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- etc/pacman.conf.in | 10 ++-- etc/pacman.d/Makefile.am | 10 +---- etc/pacman.d/mirrorlist.in | 90 ++++++++++++++++++++++---------------------- 3 files changed, 52 insertions(+), 58 deletions(-) diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 33ef181..5c518ea 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -23,23 +23,23 @@ HoldPkg = pacman glibc # have identical names, regardless of version number # #[testing] -#Include = @sysconfdir@/pacman.d/testing +#Include = @sysconfdir@/pacman.d/mirrorlist [current] # Add your preferred servers here, they will be used first -Include = @sysconfdir@/pacman.d/current +Include = @sysconfdir@/pacman.d/mirrorlist [extra] # Add your preferred servers here, they will be used first -Include = @sysconfdir@/pacman.d/extra +Include = @sysconfdir@/pacman.d/mirrorlist [community] # Add your preferred servers here, they will be used first -Include = @sysconfdir@/pacman.d/community +Include = @sysconfdir@/pacman.d/mirrorlist #[unstable] # Add your preferred servers here, they will be used first -#Include = @sysconfdir@/pacman.d/unstable +#Include = @sysconfdir@/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am index 940282d..e1f33c7 100644 --- a/etc/pacman.d/Makefile.am +++ b/etc/pacman.d/Makefile.am @@ -1,5 +1,5 @@ pkgsysconfdir = ${sysconfdir}/pacman.d -dist_pkgsysconf_DATA = community current extra release testing unstable +dist_pkgsysconf_DATA = mirrorlist EXTRA_DIST = mirrorlist.in # # Files that should be removed, but which Automake does not know. @@ -8,16 +8,10 @@ MOSTLYCLEANFILES = $(dist_pkgsysconf_DATA) $(dist_pkgsysconf_DATA): Makefile rm -f $@ $@.tmp sed \ - -e "s|@REPO[@]|$@|g" \ -e 's|@CARCH[@]|$(CARCH)|g' \ $(srcdir)/mirrorlist.in >$@.tmp mv $@.tmp $@ -community: $(srcdir)/mirrorlist.in -current: $(srcdir)/mirrorlist.in -extra: $(srcdir)/mirrorlist.in -release: $(srcdir)/mirrorlist.in -testing: $(srcdir)/mirrorlist.in -unstable: $(srcdir)/mirrorlist.in +mirrorlist: $(srcdir)/mirrorlist.in # vim:set ts=2 sw=2 noet: diff --git a/etc/pacman.d/mirrorlist.in b/etc/pacman.d/mirrorlist.in index 2889537..3e5e514 100644 --- a/etc/pacman.d/mirrorlist.in +++ b/etc/pacman.d/mirrorlist.in @@ -1,82 +1,82 @@ # -# @REPO@: Arch Linux @REPO@ repository +# $repo: Arch Linux @REPO@ repository # # United States -Server = ftp://ftp.archlinux.org/@REPO@/os/@CARCH@ -Server = ftp://ftp.nethat.com/pub/linux/archlinux/@REPO@/os/@CARCH@ -Server = ftp://locke.suu.edu/linux/dist/archlinux/@REPO@/os/@CARCH@ -Server = ftp://mirrors.unixheads.org/archlinux/@REPO@/os/@CARCH@ -Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/@REPO@/os/@… -Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/@REPO@/os/@CARCH@ -Server = http://mirrors.easynews.com/linux/archlinux/@REPO@/os/@CARCH@ -Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.archlinux.org/$repo/os/@CARCH@ +Server = ftp://ftp.nethat.com/pub/linux/archlinux/$repo/os/@CARCH@ +Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@CARCH@ +Server = ftp://mirrors.unixheads.org/archlinux/$repo/os/@CARCH@ +Server = ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@C… +Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@CARCH@ +Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@CARCH@ +Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@CARCH@ # South America # - Brazil -Server = http://archlinux.c3sl.ufpr.br/@REPO@/os/@CARCH@ +Server = http://archlinux.c3sl.ufpr.br/$repo/os/@CARCH@ # Europe # - Austria -Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/@REPO@/os/@CARCH@ +Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@CARCH@ # - Belgium -Server = ftp://ftp.belnet.be/packages/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/@CARCH@ # - Czech Republic -Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/@REPO@/os/@CARCH@ +Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@CARCH@ # - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@CARCH@ # - Finland -Server = ftp://ftp.sixnix.net/pub/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.sixnix.net/pub/archlinux/$repo/os/@CARCH@ # - France -Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/@REPO@/os/@CARCH@ -Server = ftp://mir1.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@ -Server = ftp://mir2.archlinuxfr.org/archlinux/@REPO@/os/@CARCH@ -Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.rez-gif.supelec.fr/pub/Linux/distrib/archlinux/$repo/os/@CARCH@ +Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@CARCH@ +Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@CARCH@ +Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@CARCH@ # - Germany -Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/@REPO@/os/@CARCH@ -Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/@REPO@/os/@CARCH@ -Server = ftp://ftp.archlinuxppc.org/i686/@REPO@/os/@CARCH@ -Server = http://mirror.archlinux.de/@REPO@/os/@CARCH@ +Server = ftp://ftp.tu-chemnitz.de/pub/linux/sunsite.unc-mirror/distributions/archlinux/$repo/os/@CARCH@ +Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@CARCH@ +Server = ftp://ftp.archlinuxppc.org/i686/$repo/os/@CARCH@ +Server = http://mirror.archlinux.de/$repo/os/@CARCH@ # - Great Britain -Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/@REPO@/os/… +Server = http://ftp.parrswood.manchester.sch.uk/Mirrors/ftp.archlinux.org/$repo/os/@… # - Greece -Server = ftp://ftp.ntua.gr/pub/linux/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@CARCH@ # - Ireland -Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/@REPO@/os/@CARCH@ +Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@CARCH@ # - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/@REPO@/os/@CARCH@ +Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@CARCH@ # - Lithuania -Server = ftp://saule.mintis.lt/pub/linux/@REPO@/os/@CARCH@ +Server = ftp://saule.mintis.lt/pub/linux/$repo/os/@CARCH@ # - Netherlands -Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/@REPO@/os/@CARCH@ -Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@CARCH@ +Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@CARCH@ # - Norway -Server = ftp://mirror.djzradio.net/archlinux/@REPO@/os/@CARCH@ +Server = ftp://mirror.djzradio.net/archlinux/$repo/os/@CARCH@ # - Poland -Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/@REPO@/os/@CARCH@ -Server = ftp://mirror.icis.pcz.pl/archlinux/@REPO@/os/@CARCH@ +Server = ftp://sunsite.icm.edu.pl/site/linux-sunsite/distributions/archlinux/$repo/os/@CARCH@ +Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@CARCH@ # - Portugal -Server = ftp://gul.est.ips.pt/repos/archlinux/@REPO@/os/@CARCH@ -Server = ftp://cesium.di.uminho.pt/pub/archlinux/@REPO@/os/@CARCH@ -Server = ftp://darkstar.ist.utl.pt/pub/archlinux/@REPO@/os/@CARCH@ +Server = ftp://gul.est.ips.pt/repos/archlinux/$repo/os/@CARCH@ +Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@CARCH@ +Server = ftp://darkstar.ist.utl.pt/pub/archlinux/$repo/os/@CARCH@ # - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/@REPO@/os/@CARCH@ +Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@CARCH@ # - Russia -Server = http://archlinux.freeside.ru/@REPO@/os/@CARCH@ +Server = http://archlinux.freeside.ru/$repo/os/@CARCH@ # - Sweden -Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/@REPO@/os/@CARCH@ -Server = ftp://ftp.gigabit.nu/@REPO@/os/@CARCH@ +Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@CARCH@ +Server = ftp://ftp.gigabit.nu/$repo/os/@CARCH@ # - Switzerland -Server = ftp://archlinux.puzzle.ch/@REPO@/os/@CARCH@ +Server = ftp://archlinux.puzzle.ch/$repo/os/@CARCH@ # - Turkey -Server = ftp://ftp.linux.org.tr/pub/archlinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.linux.org.tr/pub/archlinux/$repo/os/@CARCH@ # - Ukraine -Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/@REPO@/os/@CARCH@ +Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@CARCH@ # Asia # - Israel -Server = http://mirror.isoc.org.il/pub/archlinux/@REPO@/os/@CARCH@ +Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@CARCH@ # Australia -Server = ftp://mirror.pacific.net.au/linux/archlinux/@REPO@/os/@CARCH@ +Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@CARCH@ -- 1.5.2.2

2 1

[pacman-dev] asciidoc
by Andrew Fyfe 16 Jul '07

16 Jul '07

Dan McGee wrote: > -Dan > > PS Did you see my asciidoc branch? It should be ready for any more > manpages you have up your sleeve. I've rebased my asciidoc branch off of your's Dan and added the rest of the man pages. There's still some format tweaks required. Andrew

4 13

[pacman-dev] pmdepend_t / pmdepmissing_t accessors
by Xavier 16 Jul '07

16 Jul '07

I found the accessors for these two types were rather odd. There were only accessors for pmdepmissing_t, but half of them were actually accessors for the pmdepend_t field in the pmdepmissing_t structure. I thought it would make more sense to have accessors for each fields, but I could be wrong, so I'll let you decide :) >From 8de572b00ee0a6a3fbf9cd115805bcb17910cf9a Mon Sep 17 00:00:00 2001 From: Chantry Xavier <shiningxc(a)gmail.com> Date: Mon, 16 Jul 2007 14:08:48 +0200 Subject: [PATCH] new pmdepend_t / pmdepmissing_t accessors. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/alpm.h | 14 ++++++++------ lib/libalpm/deps.c | 30 +++++++++++++++--------------- src/pacman/add.c | 16 +++++++++------- src/pacman/deptest.c | 4 ++-- src/pacman/remove.c | 5 +++-- src/pacman/sync.c | 17 +++++++++-------- 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 8181f2e..62969a5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -353,12 +353,14 @@ typedef enum _pmdeptype_t { pmdepend_t *alpm_splitdep(const char *depstring); int alpm_depcmp(pmpkg_t *pkg, pmdepend_t *dep); -const char *alpm_dep_get_target(pmdepmissing_t *miss); -pmdeptype_t alpm_dep_get_type(pmdepmissing_t *miss); -pmdepmod_t alpm_dep_get_mod(pmdepmissing_t *miss); -const char *alpm_dep_get_name(pmdepmissing_t *miss); -const char *alpm_dep_get_version(pmdepmissing_t *miss); -const char *alpm_depend_get_name(pmdepend_t *dep); +const char *alpm_miss_get_target(pmdepmissing_t *miss); +pmdeptype_t alpm_miss_get_type(pmdepmissing_t *miss); +pmdepend_t *alpm_miss_get_dep(pmdepmissing_t *miss); + + +pmdepmod_t alpm_dep_get_mod(pmdepend_t *dep); +const char *alpm_dep_get_name(pmdepend_t *dep); +const char *alpm_dep_get_version(pmdepend_t *dep); /* * File conflicts diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index fd0b2e5..30c505d 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -734,7 +734,7 @@ error: return(-1); } -const char SYMEXPORT *alpm_dep_get_target(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_miss_get_target(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -745,7 +745,7 @@ const char SYMEXPORT *alpm_dep_get_target(pmdepmissing_t *miss) return miss->target; } -pmdeptype_t SYMEXPORT alpm_dep_get_type(pmdepmissing_t *miss) +pmdeptype_t SYMEXPORT alpm_miss_get_type(pmdepmissing_t *miss) { ALPM_LOG_FUNC; @@ -756,40 +756,40 @@ pmdeptype_t SYMEXPORT alpm_dep_get_type(pmdepmissing_t *miss) return miss->type; } -pmdepmod_t SYMEXPORT alpm_dep_get_mod(pmdepmissing_t *miss) +pmdepend_t SYMEXPORT *alpm_miss_get_dep(pmdepmissing_t *miss) { ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(handle != NULL, return(-1)); - ASSERT(miss != NULL, return(-1)); + ASSERT(handle != NULL, return(NULL)); + ASSERT(miss != NULL, return(NULL)); - return miss->depend.mod; + return &miss->depend; } -const char SYMEXPORT *alpm_dep_get_name(pmdepmissing_t *miss) +pmdepmod_t SYMEXPORT alpm_dep_get_mod(pmdepend_t *dep) { ALPM_LOG_FUNC; /* Sanity checks */ - ASSERT(handle != NULL, return(NULL)); - ASSERT(miss != NULL, return(NULL)); + ASSERT(handle != NULL, return(-1)); + ASSERT(dep != NULL, return(-1)); - return miss->depend.name; + return dep->mod; } -const char SYMEXPORT *alpm_dep_get_version(pmdepmissing_t *miss) +const char SYMEXPORT *alpm_dep_get_name(pmdepend_t *dep) { ALPM_LOG_FUNC; /* Sanity checks */ ASSERT(handle != NULL, return(NULL)); - ASSERT(miss != NULL, return(NULL)); + ASSERT(dep != NULL, return(NULL)); - return miss->depend.version; + return dep->name; } -const char SYMEXPORT *alpm_depend_get_name(pmdepend_t *dep) +const char SYMEXPORT *alpm_dep_get_version(pmdepend_t *dep) { ALPM_LOG_FUNC; @@ -797,7 +797,7 @@ const char SYMEXPORT *alpm_depend_get_name(pmdepend_t *dep) ASSERT(handle != NULL, return(NULL)); ASSERT(dep != NULL, return(NULL)); - return dep->name; + return dep->version; } /* vim: set ts=2 sw=2 noet: */ diff --git a/src/pacman/add.c b/src/pacman/add.c index 71578f6..67633e9 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -136,23 +136,24 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); + pmdepend_t *dep = alpm_miss_get_dep(miss); /* TODO indicate if the error was a virtual package or not: * :: %s: requires %s, provided by %s */ - printf(_(":: %s: requires %s"), alpm_dep_get_target(miss), - alpm_dep_get_name(miss)); - switch(alpm_dep_get_mod(miss)) { + printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + alpm_dep_get_name(dep)); + switch(alpm_dep_get_mod(dep)) { case PM_DEP_MOD_ANY: break; case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(miss)); + printf("=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(miss)); + printf(">=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(miss)); + printf("<=%s", alpm_dep_get_version(dep)); break; } printf("\n"); @@ -161,8 +162,9 @@ int pacman_add(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); + pmdepend_t *dep = alpm_miss_get_dep(miss); printf(_(":: %s: conflicts with %s"), - alpm_dep_get_target(miss), alpm_dep_get_name(miss)); + alpm_miss_get_target(miss), alpm_dep_get_name(dep)); } break; case PM_ERR_FILE_CONFLICTS: diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 0f149b2..7f89f6d 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -56,13 +56,13 @@ int pacman_deptest(alpm_list_t *targets) dep = alpm_splitdep(target); pkg = alpm_db_get_pkg(alpm_option_get_localdb(), - alpm_depend_get_name(dep)); + alpm_dep_get_name(dep)); if(pkg && alpm_depcmp(pkg, dep)) { found = 1; } else { /* not found, can we find anything that provides this in the local DB? */ provides = alpm_db_whatprovides(alpm_option_get_localdb(), - alpm_depend_get_name(dep)); + alpm_dep_get_name(dep)); for(j = provides; j; j = alpm_list_next(j)) { pmpkg_t *pkg; pkg = alpm_list_getdata(j); diff --git a/src/pacman/remove.c b/src/pacman/remove.c index 0b6b4ce..e60d3e8 100644 --- a/src/pacman/remove.c +++ b/src/pacman/remove.c @@ -128,8 +128,9 @@ int pacman_remove(alpm_list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - printf(_(":: %s depends on %s\n"), alpm_dep_get_target(miss), - alpm_dep_get_name(miss)); + pmdepend_t *dep = alpm_miss_get_dep(miss); + printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + alpm_dep_get_name(dep)); } alpm_list_free(data); break; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 7729370..800738d 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -650,19 +650,20 @@ int pacman_sync(alpm_list_t *targets) case PM_ERR_UNSATISFIED_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - printf(_(":: %s depends on %s\n"), alpm_dep_get_target(miss), - alpm_dep_get_name(miss)); - switch(alpm_dep_get_mod(miss)) { + pmdepend_t *dep = alpm_miss_get_dep(miss); + printf(_(":: %s: requires %s\n"), alpm_miss_get_target(miss), + alpm_dep_get_name(dep)); + switch(alpm_dep_get_mod(dep)) { case PM_DEP_MOD_ANY: break; case PM_DEP_MOD_EQ: - printf("=%s", alpm_dep_get_version(miss)); + printf("=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_GE: - printf(">=%s", alpm_dep_get_version(miss)); + printf(">=%s", alpm_dep_get_version(dep)); break; case PM_DEP_MOD_LE: - printf("<=%s", alpm_dep_get_version(miss)); + printf("<=%s", alpm_dep_get_version(dep)); break; } printf("\n"); @@ -671,9 +672,9 @@ int pacman_sync(alpm_list_t *targets) case PM_ERR_CONFLICTING_DEPS: for(i = data; i; i = alpm_list_next(i)) { pmdepmissing_t *miss = alpm_list_getdata(i); - + pmdepend_t *dep = alpm_miss_get_dep(miss); printf(_(":: %s: conflicts with %s"), - alpm_dep_get_target(miss), alpm_dep_get_name(miss)); + alpm_miss_get_target(miss), alpm_dep_get_name(dep)); } break; default: -- 1.5.2.2

2 2

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-305-gf0ea21c
by Dan McGee 16 Jul '07

16 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via f0ea21cffca62c566c5e4d2c540c70fb891b9f4c (commit) via ce1fb07436279b2ac70bdad91cf81db550292322 (commit) via edcefb1d58115d4b5ae65e258f7eb53f33d21172 (commit) via b5ab4bffb785aa92c89ff2fee1c0c9a980367cd0 (commit) via 9f9086573a74311913f0d86f5d1e826f2996b35a (commit) from 1c9f30b9fab998e2d89dd307a90122618d746cb6 (commit) - Log ----------------------------------------------------------------- commit f0ea21cffca62c566c5e4d2c540c70fb891b9f4c Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 14 09:34:39 2007 -0400 Ensure requiredby entries are removed during an upgrade This fixes the failure of the requiredby004 pactest in a not so pretty way, but it gets the job done. I purposely used the extremely long name of PM_TRANS_TYPE_REMOVEUPGRADE to be both clear and in the hope that someone else will figure out a better solution. Original idea from Nagy Gabor, patch updated and cleaned for current code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ce1fb07436279b2ac70bdad91cf81db550292322 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Sat Jul 14 00:31:48 2007 +0200 libalpm/sync.c : ldconfig is run twice. remove _alpm_ldconfig call from _alpm_sync_commit, since sync operation causes an upgrade transaction, where ldconfig is already run. Reference: http://www.archlinux.org/pipermail/pacman-dev/2007-April/008132.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit edcefb1d58115d4b5ae65e258f7eb53f33d21172 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Jul 13 23:09:25 2007 +0200 libalpm/remove.c : revert part of commit to fix remove044 pactest In 1c9f30b9fab998e2d89dd307a90122618d746cb6 This change should be done AFTER the TODO in recursedeps is implemented. Then we'll be able to first sort the list, then call recursedeps which keeps it sorted. For now, the sorting should still be done as the last step. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b5ab4bffb785aa92c89ff2fee1c0c9a980367cd0 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Jul 13 15:58:05 2007 -0400 Add TRANSLATORS file Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9f9086573a74311913f0d86f5d1e826f2996b35a Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Fri Jul 13 15:44:39 2007 -0400 Update hungarian translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: TRANSLATORS | 36 + lib/libalpm/add.c | 32 +- lib/libalpm/alpm.h | 1 + lib/libalpm/po/hu.po | 46 +- lib/libalpm/remove.c | 26 +- lib/libalpm/sync.c | 6 - lib/libalpm/trans.c | 21 +- po/hu.po | 1850 +++++++++++++++++++++++++++++++++++++------------- 8 files changed, 1483 insertions(+), 535 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 1c9f30b9fab998e2d89dd307a90122618d746cb6 \ f0ea21cffca62c566c5e4d2c540c70fb891b9f4c

3 4

Re: [pacman-dev] Huge cleanup of add.c and my attempt at fixing FS#7484
by ngaba＠petra.hos.u-szeged.hu 16 Jul '07

16 Jul '07

Well, it needs further investigation and testing, but I don't see why that provdiff stuff needed in add.c: upgrade is a "remove then add" process, remove_commit and add_commit should manage requiredby fields properly. However, see my next e-mail today. Bye, ngaba ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

2 1

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-311-g591bfab
by Dan McGee 16 Jul '07

16 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 591bfabbd38bf4f8f209977f416a4e5fd3cc2baf (commit) via aaf291c11c4e2492d008d6599b166be831314512 (commit) via a909fe60185907337808cef14c58700edaabd46b (commit) via a1e57cbec8209b64ee40fdae5990e870c8203cd7 (commit) via c2920033d078768db08c338f4908033503abfc08 (commit) via 66b09410b4da950d4be95128333128fdb2658b3c (commit) from f0ea21cffca62c566c5e4d2c540c70fb891b9f4c (commit) - Log ----------------------------------------------------------------- commit 591bfabbd38bf4f8f209977f416a4e5fd3cc2baf Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 15 21:36:46 2007 -0400 Clean up libalpm/add.c and revise file extraction code This is a full refactoring of _alpm_add_commit into multiple functions and a better layout for later. Some highlights: * No regressions in pactest performance. * Much cleaner layout. add_commit is split into four functions: upgrade_remove, extract_single_file, commit_single_pkg, _alpm_add_commit * No more super-functions, the heaviest (extract_single_file) is finally under 400 lines, with much improved commenting as well. * Incorporation of Andrew Fyfe's ideas for fixing FS #7484. Try to handle all possible cases of extraction combinations with files, symlinks, dirs, and non-existant entries on the filesystem. This should make our dealings with libarchive fall more into our control. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aaf291c11c4e2492d008d6599b166be831314512 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Jul 15 22:22:05 2007 +0200 Add new sync012 pactest. This test installs three packages with a circular dependency, to check everything still goes fine in that case. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit a909fe60185907337808cef14c58700edaabd46b Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 15 15:00:49 2007 -0400 Update AUTHORS file, change encoding to UTF-8 Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a1e57cbec8209b64ee40fdae5990e870c8203cd7 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 15 12:44:18 2007 -0400 Add --asdeps option to pacman This replaces the former -D operation that was undocumented and rather hacky. It can be used with add, upgrade, or sync transactions and will affect all packages installed. Should close FS #7193. Also tell makepkg to use this new flag. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2920033d078768db08c338f4908033503abfc08 Author: Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu> Date: Fri Jul 13 23:03:23 2007 +0200 libalpm/deps.c : cleanup + little fix for resolvedeps. The resolvedeps function was a bit negligent, as showed by the sync011 pactest. Reference : http://www.archlinux.org/pipermail/pacman-dev/2007-July/008782.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 66b09410b4da950d4be95128333128fdb2658b3c Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jul 15 10:29:26 2007 -0400 Switch repo-add, repo-remove, and pacman-optimize to bsdtar Relatively straightforward fixes (s/tar/bsdtar/g, add hyphens to options). Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: AUTHORS | 6 +- lib/libalpm/add.c | 1180 ++++++++++++++++++++++------------------- lib/libalpm/deps.c | 107 ++--- lib/libalpm/deps.h | 3 +- lib/libalpm/sync.c | 13 +- pactest/tests/sync011.py | 20 + pactest/tests/sync012.py | 20 + pactest/tests/sync030.py | 19 + pactest/tests/upgrade031.py | 19 + scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 6 +- scripts/repo-add.sh.in | 14 +- scripts/repo-remove.sh.in | 10 +- src/pacman/conf.h | 1 - src/pacman/pacman.c | 11 +- src/pacman/sync.c | 11 +- 16 files changed, 795 insertions(+), 649 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ f0ea21cffca62c566c5e4d2c540c70fb891b9f4c \ 591bfabbd38bf4f8f209977f416a4e5fd3cc2baf

1 0

[pacman-dev] Huge cleanup of add.c and my attempt at fixing FS#7484
by Dan McGee 16 Jul '07

16 Jul '07

Ok, I've been slaving away at this for a while and libalpm/add.c is finally getting a bit more manageable. Showing a patch is worthless because it is huge and is much harder to follow due to the refactoring stuff. Instead I've attached a drop-in add.c that compiles cleanly with no other changes needed. I'm looking for some feedback on this. Some highlights: 1. All pactests still pass, so no regressions on that front. 2. *Much* cleaner layout. add_commit has now been split across four functions (upgrade_remove, extract_single_file, commit_single_pkg, and _alpm_add_commit). 3. No more super functions. The heaviest function (extract_single_file) now weighs in at 350 lines, and a lot of that is comments. 4. Most of what Andrew started to do in his 7484 patch has been brought into this. However, I rewrote it a bit for clarity (at least I thought so). We may need a bit more meat added to this section. Comments/concerns/questions appreciated. I still want to cleanup the huge if(needbackup) section a bit, that is still quite long but hard to refactor. -Dan

3 7

[pacman-dev] tar/bsdtar switch
by Dan McGee 15 Jul '07

15 Jul '07

So we revised makepkg so it doesn't rely on gnutar any longer...any one want to do the same for the other tools, such as repo-add/remove, etc.? -Dan

4 6