- Pacman-dev - lists.archlinux.org

[pacman-dev] Script to validate ABS/PKGBUILDs
by Scott Horowitz 05 Nov '07

05 Nov '07

After reading Xavier's email[1] that mentioned the possibility of an external script to check for circular dependencies, I set out to do just that. Along the way, I found a number of other issues in the ABS tree and decided to report those out as well. The script is written in python because dicts make it all so much easier. It takes a little over a minute to run on my 1.5ghz machine. >From the script itself: # This script currently checks for a number of issues in your ABS # tree: # 1. Directories with missing PKGBUILDS # 2. Duplicate PKGBUILDs # 3. Referenced dependencies (and make-dependencies) that cannot # be found. This correctly takes into account any 'provides'. # 4. Circular dependencies # # Todo: # 1. Account for versioned deps, e.g., foo=1.2.3 # 2. Accommodate testing repo? Hopefully people find it useful. I'm open to suggestions and improvements. ------------- $ ./check_pkgbuilds.py WARNING: Please make sure you have a clean $ABSROOT when running this script; custom PKGBUILDs, etc. can cause false positives. Ignoring the following paths: /var/abs/local /var/abs/testing /var/abs/.sup Duplicate PKGBUILD found for junit --> /var/abs/community/devel/junit/PKGBUILD --> /var/abs/extra/devel/junit/PKGBUILD PKGBUILD not found in dir /var/abs/community/gnome/tomboy PKGBUILD not found in dir /var/abs/community/kernels/kernel26archck PKGBUILD not found in dir /var/abs/community/kernels/kernel26suspend2 Duplicate PKGBUILD found for bcprov --> /var/abs/community/lib/bcprov/PKGBUILD --> /var/abs/extra/lib/bcprov/PKGBUILD PKGBUILD not found in dir /var/abs/community/lib/cegui PKGBUILD not found in dir /var/abs/community/lib/libixp PKGBUILD not found in dir /var/abs/community/lib/libsmbios Duplicate PKGBUILD found for perl-mime-types --> /var/abs/community/lib/perl-mime-types/PKGBUILD --> /var/abs/extra/lib/perl-mime-types/PKGBUILD Duplicate PKGBUILD found for perl-module-pluggable --> /var/abs/community/lib/perl-module-pluggable/PKGBUILD --> /var/abs/extra/lib/perl-module-pluggable/PKGBUILD PKGBUILD not found in dir /var/abs/community/modules/ati-drivers PKGBUILD not found in dir /var/abs/community/modules/ati-drivers-arch PKGBUILD not found in dir /var/abs/community/multimedia/flite PKGBUILD not found in dir /var/abs/community/multimedia/gcfilms PKGBUILD not found in dir /var/abs/community/multimedia/polypaudio Duplicate PKGBUILD found for pptpclient --> /var/abs/community/network/pptpclient/PKGBUILD --> /var/abs/core/support/pptpclient/PKGBUILD Duplicate PKGBUILD found for webalizer --> /var/abs/community/network/webalizer/PKGBUILD --> /var/abs/extra/network/webalizer/PKGBUILD PKGBUILD not found in dir /var/abs/community/x11/ttf-dejavu PKGBUILD not found in dir /var/abs/community/x11/wmii PKGBUILD not found in dir /var/abs/community/x11/xarchiver Duplicate PKGBUILD found for aufs-utils --> /var/abs/community/system/aufs-utils/PKGBUILD --> /var/abs/extra/system/aufs-utils/PKGBUILD PKGBUILD not found in dir /var/abs/community/system/mkinitramfs PKGBUILD not found in dir /var/abs/community/system/qemu PKGBUILD not found in dir /var/abs/community/system/reiser4progs PKGBUILD not found in dir /var/abs/community/system/userui Cannot find dependency in package: shfs-ck>kernel26ck Cannot find dependency in package: rafkill>dumb Cannot find dependency in package: shfs-beyond>kernel26beyond Cannot find dependency in package: em8300-beyond>kernel26beyond Cannot find dependency in package: icomplete>vim-devel Cannot find dependency in package: syslog-ng>eventlog Cannot find dependency in package: em8300-ck>kernel26ck Cannot find dependency in package: em8300-suspend2>kernel26suspend2 Cannot find dependency in package: ltmodem>ltmodem-utils Cannot find dependency in package: shfs-suspend2>kernel26suspend2 Cannot find dependency in package: klibc-beyond>kernel26beyond Circular dependency found for gcc-libs --> gcc-libs>gcc>gcc-libs Circular dependency found for libxcb --> libxcb>libxslt>python>tk>libx11>libxcb Circular dependency found for gutenprint --> gutenprint>gimp>gutenprint Circular dependency found for libxslt --> libxslt>python>tk>libx11>libxcb>libxslt Circular dependency found for shadow --> shadow>pam>db>coreutils>shadow Circular dependency found for flightgear-data --> flightgear-data>flightgear>flightgear-data Circular dependency found for flightgear --> flightgear>flightgear-data>flightgear Circular dependency found for eclipse-ecj --> eclipse-ecj>gcc-gcj>eclipse-ecj Circular dependency found for libx11 --> libx11>libxcb>libxslt>python>tk>libx11 Circular dependency found for gcc-gcj --> gcc-gcj>eclipse-ecj>gcc-gcj Circular dependency found for texinfo --> texinfo>ncurses>glibc>gcc>binutils>texinfo Circular dependency found for pam --> pam>db>coreutils>pam Circular dependency found for tk --> tk>libx11>libxcb>libxslt>python>tk Circular dependency found for tzdata --> tzdata>glibc>tzdata Circular dependency found for bash --> bash>readline>glibc>bash Circular dependency found for binutils --> binutils>glibc>gcc>binutils Circular dependency found for ncurses --> ncurses>glibc>bash>readline>ncurses Circular dependency found for gimp --> gimp>gutenprint>gimp Circular dependency found for coreutils --> coreutils>pam>db>coreutils Circular dependency found for glibc --> glibc>tzdata>glibc Circular dependency found for gcc --> gcc>gcc-libs>gcc Circular dependency found for db --> db>coreutils>pam>db Circular dependency found for python --> python>tk>libx11>libxcb>libxslt>python Circular dependency found for libxml2 --> libxml2>python>tk>libx11>libxcb>libxslt>libxml2 Circular dependency found for readline --> readline>glibc>bash>readline Scott [1] http://archlinux.org/pipermail/pacman-dev/2007-November/009800.html

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-521-g0063878
by Dan McGee 04 Nov '07

04 Nov '07

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 006387828cbdd11e6307879ad27e9bb9409ca193 (commit) via 2e51e28442e5af84d6e121acf3445f7d34c098be (commit) via 8dc84344444d29a85d70285ddbd64e00c2a27dbc (commit) via 6d42439a3e22a395592b0ad88a5f77a3bf92fa78 (commit) via c32f00f77c1bfabd3a21db649fe5f622024ea850 (commit) via e5be26fb233e0d29148846db21a70870ebe0d0bb (commit) via c26fe63ee5d84492bcfb36664af8a90619e6ded5 (commit) via 8feccaed7861010caefa4f7b9824a612a78e3043 (commit) via 288dd54982b85f6feae7d41faf91a531d9f71085 (commit) via 7ee62ca216211ef3d46413bdcf6585b035c8a614 (commit) from 381690f9b3c38f51835bf4d48835d9fc830d66b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 006387828cbdd11e6307879ad27e9bb9409ca193 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 09:47:21 2007 -0600 Readd scriptlet logging that got lost in an earlier commit I broke scriptlet logging with ad691001e20272b794d2ed574b556f520e3555c0. Readd more or less what was there before, although it still needs a lot of work including hopefully rewriting it to a new event subsystem and having it log to a seperate file. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2e51e28442e5af84d6e121acf3445f7d34c098be Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 11:43:32 2007 -0500 vercmp: add some usage instructions Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8dc84344444d29a85d70285ddbd64e00c2a27dbc Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 11:13:24 2007 -0600 Remove unneeded CXX macros from acinclude.m4 This follows the removal patch previously used for GCC & F77 macros. If we don't use it, dump it so we can speed up configure time. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6d42439a3e22a395592b0ad88a5f77a3bf92fa78 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 10:45:55 2007 -0600 Add some text at the top of acinclude.m4 so people know what is going on Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c32f00f77c1bfabd3a21db649fe5f622024ea850 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 13:10:31 2007 -0500 Remove unneeded F77 and GCJ libtool macros from acinclude.m4 We don't use Fortran or Java code in our project, so no need to waste time looking for this stuff. This gives a noticeable speedup to running the ./configure program as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e5be26fb233e0d29148846db21a70870ebe0d0bb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 1 19:36:50 2007 -0500 Make building of pacman.static optional Because building of pacman.static fails on some platforms, we should make it optional. It is enabled by default but can be disabled with the use of the --disable-pacman-static flag. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c26fe63ee5d84492bcfb36664af8a90619e6ded5 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 22:19:03 2007 -0500 Add some more autoconf macros to filter our CFLAGS usage Hopefully these new autoconf macros, with a little magic, will allow us to compile with any compiler and still choose the options we have available to us. Tested locally with gcc 4.2.2 and gcc 3.4.6; the latter doesn't support two of the items we previously had hardcoded in our CFLAGS. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8feccaed7861010caefa4f7b9824a612a78e3043 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 21:30:09 2007 -0500 Use an autoconf macro to see if -fstack-protector is available Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 288dd54982b85f6feae7d41faf91a531d9f71085 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 13:13:28 2007 -0500 Revise configure.ac Do a little cleanup of our configure script. Highlights: * Remove macros deemed unnecessary to call [1] * Change check for compiler to look for one that is C99 capable- this automatically adds the -std=gnu99 flag [1] Noted in the autoconf NEWS file, notably entries for 2.59d Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7ee62ca216211ef3d46413bdcf6585b035c8a614 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 4 10:41:44 2007 -0600 Update libtool files and macros to newest versions It looks like some of the newer libtool m4 files offer improved support for the Darwin platform and possibly BSD, so bump our files to these new versions. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: acinclude.m4 | 2123 ++++++++--------------------------------------- config.guess | 4 +- config.sub | 6 +- configure.ac | 54 +- lib/libalpm/Makefile.am | 9 +- lib/libalpm/add.c | 8 +- lib/libalpm/alpm.h | 1 + lib/libalpm/remove.c | 4 +- lib/libalpm/trans.c | 19 +- lib/libalpm/trans.h | 2 +- ltmain.sh | 233 ++++-- src/pacman/Makefile.am | 6 +- src/pacman/callback.c | 3 + src/util/vercmp.c | 21 + 14 files changed, 589 insertions(+), 1904 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-511-g381690f
by Dan McGee 04 Nov '07

04 Nov '07

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 381690f9b3c38f51835bf4d48835d9fc830d66b1 (commit) via ab91cef65503e3162d33146414cb901c6cb60597 (commit) via dea9b3bc0f6ba49aec8452958f5373fbb20e7df2 (commit) via 4a5e7b6bd1a887f67b9b9ec8115250fc92c741ca (commit) via 0ea43089e1b95bd7b4e25ca170e155295f2b2b2d (commit) via bcb5465b21f6cafbd044d9aa3b6418dbac909638 (commit) from ccdf29ffa8436d3cd5409b0d02287207716cf397 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 381690f9b3c38f51835bf4d48835d9fc830d66b1 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 20:21:55 2007 -0500 Update my TODO commit ab91cef65503e3162d33146414cb901c6cb60597 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 11:37:49 2007 -0500 Add a little const correctness fix to alpm_list Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dea9b3bc0f6ba49aec8452958f5373fbb20e7df2 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 11:43:04 2007 -0500 Fix basename usage in pacman and utilities basename() is a rather untrusty function call on a lot of platforms as it does some weird and different things. To solve this, I added a mbasename fuction to pacman to take its place, and simply removed its usage in the utilities (it isn't worth dealing with there). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a5e7b6bd1a887f67b9b9ec8115250fc92c741ca Author: Roman Kyrylych <roman(a)archlinux.org> Date: Wed Oct 31 18:41:17 2007 +0200 Add support for arch='any' Signed-off-by: Roman Kyrylych <roman(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ea43089e1b95bd7b4e25ca170e155295f2b2b2d Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 31 15:12:33 2007 -0500 Remove final use of the math library from pacman To round a value, we don't need floorf- we can just cast to an int. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bcb5465b21f6cafbd044d9aa3b6418dbac909638 Author: Jeff Mickey <jeff(a)archlinux.org> Date: Fri Nov 2 18:26:31 2007 -0400 Added optdepends support to pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: TODO.dan | 32 ++++---------------------------- configure.ac | 3 --- lib/libalpm/alpm_list.c | 7 ++++--- pactest/pmdb.py | 4 ++++ pactest/pmpkg.py | 3 +++ pactest/pmrule.py | 3 +++ pactest/util.py | 2 ++ scripts/gensync.sh.in | 3 +++ scripts/makepkg.sh.in | 4 ++++ scripts/updatesync.sh.in | 3 +++ src/pacman/callback.c | 3 +-- src/pacman/pacman.c | 36 +++++++++++++++++++++++++++++------- src/util/testdb.c | 4 +++- src/util/testpkg.c | 4 +++- 14 files changed, 66 insertions(+), 45 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Added optdepends support to pactest
by Jeff Mickey 03 Nov '07

03 Nov '07

diff --git a/pactest/pmdb.py b/pactest/pmdb.py index 5d5104f..ebde324 100755 --- a/pactest/pmdb.py +++ b/pactest/pmdb.py @@ -187,6 +187,8 @@ class pmdb: line = line.strip("\n") if line == "%DEPENDS%": pkg.depends = _getsection(fd) + elif line == "%OPTDEPENDS%": + pkg.optdepends = _getsection(fd) elif line == "%REQUIREDBY%": pkg.requiredby = _getsection(fd) elif line == "%CONFLICTS%": @@ -291,6 +293,8 @@ class pmdb: data = [] if pkg.depends: data.append(_mksection("DEPENDS", pkg.depends)) + if pkg.optdepends: + data.append(_mksection("OPTDEPENDS", pkg.optdepends)) if self.treename == "local": if pkg.requiredby: data.append(_mksection("REQUIREDBY", pkg.requiredby)) diff --git a/pactest/pmpkg.py b/pactest/pmpkg.py index c6859e8..410423d 100755 --- a/pactest/pmpkg.py +++ b/pactest/pmpkg.py @@ -53,6 +53,7 @@ class pmpkg: self.force = 0 # sync only (will be moved to depends) # depends self.depends = [] + self.optdepends = [] self.requiredby = [] # local only self.conflicts = [] self.provides = [] @@ -146,6 +147,8 @@ class pmpkg: data.append("group = %s" % i) for i in self.depends: data.append("depend = %s" % i) + for i in self.optdepends: + data.append("optdepend = %s" % i) for i in self.conflicts: data.append("conflict = %s" % i) for i in self.provides: diff --git a/pactest/pmrule.py b/pactest/pmrule.py index d5d0f56..c5682dc 100755 --- a/pactest/pmrule.py +++ b/pactest/pmrule.py @@ -83,6 +83,9 @@ class pmrule: elif case == "DEPENDS": if not value in newpkg.depends: success = 0 + elif case == "OPTDEPENDS": + if not value in newpkg.optdepends: + success = 0 elif case == "REQUIREDBY": if not value in newpkg.requiredby: success = 0 diff --git a/pactest/util.py b/pactest/util.py index d320342..ae20374 100755 --- a/pactest/util.py +++ b/pactest/util.py @@ -149,6 +149,8 @@ def mkdescfile(filename, pkg): data.append("replaces = %s" % i) for i in pkg.depends: data.append("depend = %s" % i) + for i in pkg.optdepends: + data.append("optdepend = %s" % i) for i in pkg.conflicts: data.append("conflict = %s" % i) for i in pkg.provides: -- 1.5.2.4

2 1

Re: [pacman-dev] [arch-dev-public] Fwd: [arch] circular dependence in core
by Xavier 01 Nov '07

01 Nov '07

On Thu, Nov 01, 2007 at 06:17:31PM +0200, Roman Kyrylych wrote: > 2007/11/1, Roman Kyrylych <roman.kyrylych(a)gmail.com>: > > 2007/11/1, Aaron Griffin <aaronmgriffin(a)gmail.com>: > > > Forwarding to the dev list in case people don't read the arch list. > > > > > > ---------- Forwarded message ---------- > > > From: Mister Dobalina <reebydobalina(a)yahoo.ca> > > > Date: Nov 1, 2007 10:27 AM > > > Subject: [arch] circular dependence in core > > > To: General Discusson about Arch Linux <arch(a)archlinux.org> > > > > > > > > > coreutils 6.9-3 -> depends on bash > > > > > > bash 3.2.025-1 -> depends on readline>=5.2 > > > > > > readline 5.2-4 -> depends on ncurses > > > > > > ncurses 5.6-4 -> depends on coreutils -> oops! > > > > > > > This was casused by this commit: > > http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/base/ncurses/PKGBUILD.diff?r1=… > > I think we should revert it (because dependencies of other packages > > are fine and make more sense). > > > > And it was ncurses-5.6-4 package release that broke it. > http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/base/ncurses/PKGBUILD.diff?r1=… > And we all missed this because pacman didn't complain when upgrading. > Well, no, this doesn't prevent pacman from installing the packages, only from sorting them, which is usually not critical. So pacman only prints a little warning in the --debug output when it detects a loop while sorting the packages, but that's all. Something like "dependency cycle detected" I don't know if this message should always be printed, on standard pacman output. There could maybe be a pacman option or an external tool for detecting dependencies cycles.

2 1

[pacman-dev] libalpm data structures
by Nagy Gabor 01 Nov '07

01 Nov '07

Hi! This is discussion-only (==no-patch) e-mail, mainly about code clean-up, so if you don't like that type of e-mails, please skip this. Xavier's compute_requiredby catch was the motivation of this e-mail: I never liked the following method: pmdepend_t *dep = alpm_splitdep(depend) /* char -> pmdepend_t conversion */ ...alpm_depcmp(pkg, dep)... FREE(dep) /* usually forgotten */ So I asked myself: Do we really need pmdepend_t struct? Why don't we use it in alpm_depcmp only ("internally")? So the depend-input of alpm_depcmp could be char* (and pmdepend_t should be disappear from libalpm API). Then I read the .h files of libalpm. My impressions: 1. We don't need pmdepend_t => pmdepmod_t. See above. This is mainly used in pmdepmissing_t which is used to collect missing dependencies (pmdepmissing_t is not needed here neither), and to print error/log messages (usually pmdepend_t -> char conversion is done here, too); where we could also use char. 2. We have pmconflict_t. Nice. So we don't need pmdeptype_t (in pmdepmissing_t). As we discussed with Xavier, pmconflict_t should be a symmetric structure: {target,ctarget} set [<=> alpm_strcmp ordered (target, ctarget) pair] instead of (target,ctarget) ordered pair) <- this is a pmconflict_t-helper-function problem only. Future plans: 3. I still want to kill pmsyncpkg_t => pmsynctype_t (the ugliest data struct of libalpm) 4. If my preferred universal transaction becomes true, we won't need pmtranstype_t. And of course, if we rip off some unneeded structures, we also rip off tons of unneeded associated helper functions. Personally, I want to make a patch for 1. and 2. So if you don't like the idea, let me know. However, I'm a bit unsure in 2.: should I keep target and ctarget as char, or I should use pmpkg_t* instead <- faster but more "dangerous". Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

5 24

[pacman-dev] [PATCH] Add support for arch='all' to makepkg
by Roman Kyrylych 31 Oct '07

31 Oct '07

Hi! Today I have started adding support for noarch packages. This is the first step. The attached patch adds support for arch='all' to makepkg. It's very simple because it just sets CARCH to all and then everything else goes as usual. When we'll add support for subpackages - we'll have to make additional checks to be sure we can build -i686/-x86_64 package and -all package from one PKGBUILD. This depends on a way we implement subpackages and can be modified later. So far, pacman-git is able to install packages built with the modified makepkg, and shows "Architecture: all" on -Qi. I'll post patches for other scripts soon. How to test it: 1) get any font/cursor/etc PKGBUILD from AUR, 2) replace arch=('i686' 'x86_64') with arch='all' 3) use the patched makepkg to build the package 4) use pacman -U (git version, 3.0.x fails) to install the package 5) do pacman -Qi -- Roman Kyrylych (Роман Кирилич)

4 12

[pacman-dev] Conflicts handling
by Xavier 31 Oct '07

31 Oct '07

The pending patch [1] from Nagy for conflicts handling broke the following pactests : sync040, sync041, sync990 These pactests are "target vs target" conflicts that pacman doesn't try to resolve, and just stops. Nagy's patch tried to resolve these conflicts by removing one of the two conflicting targets. So that broke the 3 pactests above. When trying to change the code slightly to make pacman fail in this target-target case, the 3 pactests above now succeed, but it breaks 5 others : sync893, sync897, sync898, sync992, sync999 These pactests are actually other kinds of target vs target conflicts. So finally, pacman tries to auto-resolve these conflicts more often than not, instead of just failing. That's what I failed to see earlier, that there were different cases to consider. Now I see at least 4 kinds of target-target conflicts. I'm attaching 4 pactests to illustrate that. In my opinion, pacman could always fail with these target-target conflicts. This kind of conlicts is very rare (it doesn't make any sense to install two conflicting targets). However it can happen in an odd situation (see bug 7415), where a group is splitted across several repos. But pacman's behavior in this case is very odd anyway.. So I think it wouldn't be worse if pacman just failed, and so it would be left to the user to fix it manually, by removing the conflicting package from the targets, for example using --ignore. So this would give both a more coherent behavior, and cleaner code. If that's alright, I will try to edit (correctly this time) Nagy's patch to behave like that. But the 5 pactests listed above will then have to be edited accordingly (mostly changing PACMAN_RETCODE from 0 to 1). [1] http://www.archlinux.org/pipermail/pacman-dev/2007-August/009078.html

2 2

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-505-gccdf29f
by Dan McGee 31 Oct '07

31 Oct '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 ccdf29ffa8436d3cd5409b0d02287207716cf397 (commit) via ac79135b94b1cd2c3fc4818bdfbe8ec63a6166b6 (commit) via 6aeda5fbff1969befa322ef7b79664f13dea1d18 (commit) via be387148c95ee5ed4e45dc841cd12fee010b998a (commit) via 6af7dbcf72b0e95f7c36b17fac88fd2658c2a8e4 (commit) via aea45a8b20c786358cfe782b4e3ac37c7d9dbe37 (commit) via dede5371e7c11ceb6ea36ba770672d61aa9b9002 (commit) via 74aa54a1f6db109311e9bdc8cae64a2a26a2b860 (commit) via 014306eb99c90c5c5c6d19d50aa47e29c25e8e14 (commit) via c50a7c6026e491771f0607d5e3fed737b3b5e8f3 (commit) via 6cf8a5137e9e0a8fcdf5287187935ffc505a2132 (commit) via cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a (commit) via fe3a461703a5d90937c0c6f1ce0c3d802c0f8630 (commit) from 671224b64c9478644125deec1496a27e8f579da9 (commit) - Log ----------------------------------------------------------------- commit ccdf29ffa8436d3cd5409b0d02287207716cf397 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 08:12:09 2007 -0500 abs: prefer csup to cvsup Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac79135b94b1cd2c3fc4818bdfbe8ec63a6166b6 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 30 00:20:18 2007 -0500 Pick best python program available for 'make check' Use an autoconf macro to find us a python executable, preferring python2.5 if we can find it. From there, fall back to python2.4 and then python. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6aeda5fbff1969befa322ef7b79664f13dea1d18 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:32:58 2007 -0500 When printing size_t, use %zd %d was used, which worked for Linux and FreeBSD. Not so for Darwin. The warning was probably spat out when compiling on x68_64 as well, but no developers use this architecture as their primary one. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit be387148c95ee5ed4e45dc841cd12fee010b998a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:12:37 2007 -0500 libalpm/handle.c: make realpath() call portable BSD didn't support the NULL second argument GNU extension, so do it the old fashioned way. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6af7dbcf72b0e95f7c36b17fac88fd2658c2a8e4 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 23:11:49 2007 -0500 pacman/query.c: add missing free() Signed-off-by: Dan McGee <dan(a)archlinux.org> commit aea45a8b20c786358cfe782b4e3ac37c7d9dbe37 Author: Scott Horowitz <stonecrest(a)gmail.com> Date: Mon Oct 29 21:25:30 2007 -0600 Small updates to documentation. Signed-off-by: Scott Horowitz <stonecrest(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dede5371e7c11ceb6ea36ba770672d61aa9b9002 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 21:06:13 2007 -0500 Copy pmdelta_t objects in _alpm_pkg_dup() This was forgotten in the original set of patches. CC: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 74aa54a1f6db109311e9bdc8cae64a2a26a2b860 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 21:03:41 2007 -0500 Make general list copy function Package dup needs to copy all members. Nathan had his implementation, but I generalized it to this new alpm_list function (and will use it in the next commit). CC: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 014306eb99c90c5c5c6d19d50aa47e29c25e8e14 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 28 13:39:12 2007 +0100 simple pactest renaming : split conflict* into depconflict* and fileconflict*. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c50a7c6026e491771f0607d5e3fed737b3b5e8f3 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 07:13:58 2007 -0500 doxygen: preprocess SYMHIDDEN/SYMEXPORT macros so they don't show in docs Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6cf8a5137e9e0a8fcdf5287187935ffc505a2132 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 01:28:13 2007 -0500 libalpm/delta: add const to most methods Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cc754bc6e3be0f37ca0eaca4b6b90f033433fb1a Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 01:00:52 2007 -0500 libalpm: introduce MALLOC and CALLOC macros These macros take the place of the common 4 or 5 line blocks of code we had in most places that called malloc or calloc. This should reduce some code duplication and make memory allocation more standard in libalpm. Highlights: * Note that the MALLOC macro actually uses calloc, this is just for safety so that memory is initialized to 0. This can be easily changed in one place. * One malloc call was completely eliminated- it made more sense to do it on the stack. * The use of RET_ERR in public functions (mainly the alpm_*_new functions) was standardized, this makes sense so pm_errno is set. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fe3a461703a5d90937c0c6f1ce0c3d802c0f8630 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 29 00:01:17 2007 -0500 Add some more debugging output to dep checking code Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: Makefile.am | 2 +- configure.ac | 3 +- doc/Doxyfile | 6 +- doc/PKGBUILD.5.txt | 76 +++++++++++++++++-- doc/makepkg.8.txt | 18 ++++-- lib/libalpm/alpm.h | 8 +- lib/libalpm/alpm_list.c | 26 ++++++- lib/libalpm/alpm_list.h | 1 + lib/libalpm/conflict.c | 9 +-- lib/libalpm/db.c | 13 +--- lib/libalpm/delta.c | 11 ++-- lib/libalpm/deps.c | 33 ++++----- lib/libalpm/group.c | 7 +-- lib/libalpm/handle.c | 14 +--- lib/libalpm/package.c | 21 ++---- lib/libalpm/server.c | 12 +--- lib/libalpm/sync.c | 20 +++--- lib/libalpm/trans.c | 5 +- lib/libalpm/util.h | 7 ++- .../tests/{conflict004.py => depconflict100.py} | 0 .../tests/{conflict002.py => depconflict110.py} | 0 .../tests/{conflict003.py => depconflict111.py} | 2 +- .../tests/{conflict001.py => depconflict120.py} | 0 .../tests/{conflict005.py => fileconflict001.py} | 0 .../tests/{conflict006.py => fileconflict002.py} | 1 - scripts/abs.sh.in | 10 ++-- src/pacman/callback.c | 3 +- src/pacman/conf.c | 3 +- src/pacman/query.c | 3 +- 29 files changed, 182 insertions(+), 132 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 671224b64c9478644125deec1496a27e8f579da9 \ ccdf29ffa8436d3cd5409b0d02287207716cf397

1 0

[pacman-dev] [PATCH] Copy pmdelta_t objects in _alpm_pkg_dup().
by Nathan Jones 30 Oct '07

30 Oct '07

_alpm_pkg_dup() should create copies of all objects inside the pmpkg_t struct. I missed this function when adding the delta list to pmpkg_t. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- lib/libalpm/package.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 4f6f5a9..7829d48 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -49,6 +49,7 @@ #include "provide.h" #include "handle.h" #include "alpm.h" +#include "delta.h" /** \addtogroup alpm_packages Package Functions * @brief Functions to manipulate libalpm packages @@ -689,6 +690,7 @@ pmpkg_t *_alpm_pkg_new(const char *name, const char *version) pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) { pmpkg_t* newpkg; + alpm_list_t *deltas; ALPM_LOG_FUNC; @@ -708,6 +710,23 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->groups = alpm_list_strdup(alpm_pkg_get_groups(pkg)); newpkg->provides = alpm_list_strdup(alpm_pkg_get_provides(pkg)); newpkg->replaces = alpm_list_strdup(alpm_pkg_get_replaces(pkg)); + + /* copy all the delta objects */ + newpkg->deltas = NULL; + deltas = alpm_pkg_get_deltas(pkg); + while(deltas) { + pmdelta_t *d = malloc(sizeof(pmdelta_t)); + + if(d == NULL) { + _alpm_log(PM_LOG_ERROR, _("malloc failure: could not allocate %d bytes\n"), sizeof(pmdelta_t)); + RET_ERR(PM_ERR_MEMORY, NULL); + } + + memcpy(d, alpm_list_getdata(deltas), sizeof(pmdelta_t)); + newpkg->deltas = alpm_list_add(newpkg->deltas, d); + deltas = alpm_list_next(deltas); + } + /* internal */ if(newpkg->origin == PKG_FROM_FILE) { newpkg->origin_data.file = strdup(pkg->origin_data.file); -- 1.5.3.4

3 5