- Pacman-dev - lists.archlinux.org

[pacman-dev] pacman doesn't remove lockfile after -Sy failure
by Nagy Gabor 16 Oct '07

16 Oct '07

Hi! I said everything in the subject. You can test with /etc/rc.d/network stop pacman -Sy pacman -Sy Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 3

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-464-g128b288
by Dan McGee 15 Oct '07

15 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 128b288ca7f396d3cbb6c9620807075274bdbe8e (commit) via 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 (commit) via 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb (commit) via 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 (commit) via abce73de4cc124da946a4da2d413b784332d91db (commit) via 0adedc536fe372b4def5954f3b24ca63ff86aecf (commit) via 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 (commit) via 3c4e98f7b56c17590965be9dbae25fe1915b75cb (commit) from 7f3adc3936ca66d86ff18e06e77da66bcef843ff (commit) - Log ----------------------------------------------------------------- commit 128b288ca7f396d3cbb6c9620807075274bdbe8e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 18:52:17 2007 -0500 Fix scriptlet pactest cases so they 'succeed' again Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d7e06f204d7f94aa9d22cd4e4a895d2780025e8 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Oct 14 10:17:48 2007 +0200 libalpm/trans.c : fix a recently introduced breakage in scriptlets handling. Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 4e6a03c4f6d413aa9f1c98d255c370c442ce55eb Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 18:09:49 2007 +0200 libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet. This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 5d30c5c0b76e76b336abd2486ac6d24dd972fcc3 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 17:10:51 2007 +0200 pacman/pacman.c : put back root check even if -r is specified. Root is needed for most install / remove operation, because it's needed for chrooting, for running scriptlets. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit abce73de4cc124da946a4da2d413b784332d91db Author: Nathan Jones <nathanj(a)insightbb.com> Date: Sun Oct 14 11:59:38 2007 -0400 Manually check xdelta exit codes. This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0adedc536fe372b4def5954f3b24ca63ff86aecf Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 14 17:29:32 2007 -0500 Updates to fix Doxygen documentation generation We had way too much going on with the Doxygen manpage generation. Clean it up quite a bit by removing directory manpages, using relative paths, not having a manpage for every single alpm function, and ensuring internal functions are not documented publicly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5adb8d4b5ac6928ba1a0736d96ca6c533d8cbc76 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 10 06:57:42 2007 -0500 util/testdb: fix up function naming We shouldn't use the _alpm prefix (copy-paste issue, no big deal). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3c4e98f7b56c17590965be9dbae25fe1915b75cb Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Oct 9 13:27:08 2007 -0500 Add two new pactests to check symlink behavior Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: doc/Doxyfile | 6 ++-- doc/Makefile.am | 2 +- lib/libalpm/alpm.h | 4 +- lib/libalpm/alpm_list.h | 6 +--- lib/libalpm/md5.h | 6 ++-- lib/libalpm/trans.c | 52 ++++++++++++++++++++++++---------------- pactest/tests/conflict005.py | 20 +++++++++++++++ pactest/tests/conflict006.py | 17 +++++++++++++ pactest/tests/scriptlet001.py | 5 ++++ pactest/tests/scriptlet002.py | 5 ++++ scripts/makepkg.sh.in | 29 +++++++++++++++------- src/pacman/pacman.c | 4 +-- src/util/testdb.c | 8 +++--- 13 files changed, 114 insertions(+), 50 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 7f3adc3936ca66d86ff18e06e77da66bcef843ff \ 128b288ca7f396d3cbb6c9620807075274bdbe8e

1 0

[pacman-dev] [PATCH] Manually check xdelta exit codes.
by Nathan Jones 14 Oct '07

14 Oct '07

This is needed because 'xdelta delta' returns 1 even when the delta creation succeeds. This was causing makepkg to exit after the command due to bash's -e option. Some information from the xdelta man page: The delta command exits with status 0 to indicate that no differences were found, with status 1 to indicate that some differences were found, and with status 2 to indicate an error of some kind. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- scripts/makepkg.sh.in | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 4a68c84..193afe4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -900,17 +900,33 @@ create_xdelta() { msg "$(gettext "Making delta from version %s...")" "$latest_version" local delta_file="$PKGDEST/$pkgname-${latest_version}_to_$pkgver-$pkgrel-$CARCH.delta" + # 'xdelta delta' returns 1 even on success, so manually check exit codes + # bash's exit on error option must first be unset + set +e + # xdelta will decompress base_file & pkg_file into TMP_DIR (or /tmp if # TMP_DIR is unset) then perform the delta on the resulting tars xdelta delta "$base_file" "$pkg_file" "$delta_file" - # Generate the final gz using xdelta for compression. xdelta will be our - # common denominator compression utility between the packager and the users - # makepkg and pacman must use the same compression algorithm or the delta - # generated package may not match, producing md5 checksum errors. - msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" - msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" - xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? = 0 -o $? = 1 ]; then + # Generate the final gz using xdelta for compression. xdelta will be our + # common denominator compression utility between the packager and the + # users. makepkg and pacman must use the same compression algorithm or + # the delta generated package may not match, producing md5 checksum + # errors. + msg2 "$(gettext "Recreating package tarball from delta to match md5 signatures")" + msg2 "$(gettext "NOTE: the delta should ONLY be distributed with this tarball")" + xdelta patch "$delta_file" "$base_file" "$pkg_file" + if [ $? != 0 ]; then + error "$(gettext "Could not generate the package from the delta.")" + exit 1 + fi + else + warning "$(gettext "Delta was not able to be created.")" + fi + + # turn exit on error back on + set -e else warning "$(gettext "No previous version found, skipping xdelta.")" fi -- 1.5.3.4

2 3

[pacman-dev] [PATCH 3/3] libalpm/trans.c : fix a recently introduced breakage in scriptlets handling.
by Chantry Xavier 14 Oct '07

14 Oct '07

Commit 4853a4aad97fe36f9237ffb7356201adab507a1c used the tmpdir variable for checking the existence of /bin/sh, without resetting it. This caused /bin/sh to be deleted during the cleanup part, as soon as a scriptlet other than pre_upgrade or pre_install was executed. For example, on the first post_upgrade during a -Su. I introduced two variables : clean_tmpdir and restore_cwd, for deciding what should be done in the cleanup part. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)

1 0

[pacman-dev] [PATCH 2/3] libalpm/trans.c : remove the DBPath <-> RootDir dependence in runscriptlet.
by Chantry Xavier 14 Oct '07

14 Oct '07

This code assumed that DBPath was under RootDir, while this is not necessarily the case : pacman doesn't enforce anymore than DBPath is under RootDir. So now, all scriptlets will be put somewhere in RootDir/tmp/, so that when it chroots in RootDir, the scriptlets are still available inside the chroot. This also removes the need of normalizing both dbpath and rootdir, in order to do computation on the paths. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/trans.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-)

1 0

[pacman-dev] [PATCH 1/3] pacman/pacman.c : put back root check even if -r is specified.
by Chantry Xavier 14 Oct '07

14 Oct '07

Root is needed for most install / remove operation, because it's needed for chrooting, for running scriptlets. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- src/pacman/pacman.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)

1 0

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-456-g7f3adc3
by Dan McGee 09 Oct '07

09 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 7f3adc3936ca66d86ff18e06e77da66bcef843ff (commit) from 5e3a1bdec625412f07d99a56152959fcb10d6b04 (commit) - Log ----------------------------------------------------------------- commit 7f3adc3936ca66d86ff18e06e77da66bcef843ff Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 9 12:38:23 2007 -0500 Add new French Arch mirror Fix Aaron's busted-a** commit. :P Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 5e3a1bdec625412f07d99a56152959fcb10d6b04 \ 7f3adc3936ca66d86ff18e06e77da66bcef843ff

2 1

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-455-g5e3a1bd
by Aaron Griffin 09 Oct '07

09 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 5e3a1bdec625412f07d99a56152959fcb10d6b04 (commit) from 6db0562b8d3cda777650521f1205a541d0e0aa93 (commit) - Log ----------------------------------------------------------------- commit 5e3a1bdec625412f07d99a56152959fcb10d6b04 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Tue Oct 9 12:41:05 2007 -0500 New French mirror at ftp.free.fr Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 6db0562b8d3cda777650521f1205a541d0e0aa93 \ 5e3a1bdec625412f07d99a56152959fcb10d6b04

1 0

[pacman-dev] Future pacman development (3.2/4.0)
by Dan McGee 09 Oct '07

09 Oct '07

Here is a little email to get ideas flowing on what will follow the 3.1 release in pacman development. I might as well start it off with a bang by saying I think pacman (and especially libalpm) would be best if it got a full cleansing and rewrite. This is one of those things that is just tough to do, but I think all of us can see the benefits in doing it. We've seen where our current interface is a bit lacking, and we could find many ways to improve on that. There would also be the ability to rewrite pacman to be much more efficient in some of the operations that are currently the bottlenecks (namely lists). Lists could be replaced by hash tables in a few places (package caches?), and in other places we could simply use better list structures in order to navigate them more efficiently. I really like the idea of using a kernel list implementation to do this, as it would enforce typing. However, the details of that may need to be reasonably well hidden inside the library. If we were to do a rewrite, I think the best way would be to do it slowly and one piece at a time. Start with the backend interface and slowly build from there, setting interfaces at each level. Much of the code could be gleaned from the existing codebase, but scrutinized a bit to ensure it is of good quality and doing things the way we want to. Other code would end up in some burning inferno somewhere never to be seen again, which would make me more than happy. If we don't do a full rewrite, something that really needs looking at is the list data structures we use. alpm_list_last (called by alpm_list_add) is a huge bottleneck, consuming 40% of the time in a pacman -Su operation from start to when you are presented with the package list to install. That is pretty pathetic. A pacman -Qo operation is another great example of the inefficiency of the existing list structure. Thoughts and comments welcome. -Dan

8 31

[pacman-dev] [GIT] The official pacman repository branch, master now at v3.0.0-454-g6db0562
by Dan McGee 09 Oct '07

09 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 6db0562b8d3cda777650521f1205a541d0e0aa93 (commit) via 087b8df781fb229033e9c01f58cdf80f0ddd29e6 (commit) via e03a1f0044ebd7a477b44af411f296d72e3bba4d (commit) via 920b0d2049deb148efe89bfebda03d172b68c1f5 (commit) via b1613c26518abb55ae5fc970dccfb7e3c97398d1 (commit) via 3d8408759d16b1ecfa6e7981d0cc3db1f39163a4 (commit) via 1ff8e7f364a9f640ada7526384646d510ac29967 (commit) via 60dc4b43fd4ad1c1ca2ab31f7ace7179fe3d1844 (commit) via 6aac22187997162e9033e4b747a2421a846b9b6d (commit) via f5f4650de7e1e12c43eec6e3bf72e77540a2b493 (commit) via 4853a4aad97fe36f9237ffb7356201adab507a1c (commit) via 98bcd1f5b1023b9eb219589c809fb2505079965d (commit) via 02ec82b8c6fb2b2b89df92d79e9f8a28ce093cbe (commit) from 52e7e6d74733f7a431376a9e528c4fe4d3732068 (commit) - Log ----------------------------------------------------------------- commit 6db0562b8d3cda777650521f1205a541d0e0aa93 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 8 21:25:52 2007 -0500 Add gcc format attribute to _alpm_log, catch a few bugs in the process This fixed a few of our formatted output strings that were broken before but never being checked. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 087b8df781fb229033e9c01f58cdf80f0ddd29e6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 8 21:21:04 2007 -0500 libalpm/package.c: ensure we use package name when loading packages Some of the error messages in _alpm_pkg_load failed to use the pkgname value when printing, which made error messages rather hard to decode. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e03a1f0044ebd7a477b44af411f296d72e3bba4d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Oct 5 16:18:29 2007 +0200 pacman/pacman.c : add --logfile option. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 920b0d2049deb148efe89bfebda03d172b68c1f5 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 7 15:00:24 2007 -0500 Update usage of gcc __attribute__ flags Change the default visibility of libalpm functions to internal instead of hidden- this allows for slightly better optimization because it tells GCC that the function can never be called outside of the current module (see http://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html) Also added some attributes to the pacman print functions so that they check the format strings being passed to them. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b1613c26518abb55ae5fc970dccfb7e3c97398d1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 5 00:13:36 2007 -0500 Clean up the scriptlet fork code a bit, honor the child return value Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3d8408759d16b1ecfa6e7981d0cc3db1f39163a4 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Oct 4 22:00:39 2007 -0500 Add new (failing) sync pactest Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ff8e7f364a9f640ada7526384646d510ac29967 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Aug 20 16:34:43 2007 -0400 Remove the non-user friendly --ask option Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 60dc4b43fd4ad1c1ca2ab31f7ace7179fe3d1844 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 4 20:42:43 2007 -0500 Fix backward compatibility with non-epoch builddates Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6aac22187997162e9033e4b747a2421a846b9b6d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 2 06:59:36 2007 -0500 Add new french mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5f4650de7e1e12c43eec6e3bf72e77540a2b493 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 1 06:29:32 2007 -0500 pacman-optimize: add check for diff/diffutils Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4853a4aad97fe36f9237ffb7356201adab507a1c Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Thu Oct 4 21:36:25 2007 -0500 Fail loudly is scriptlets cannot be run via /bin/sh If /bin/sh is missing in the root directory, scriptlets cannot be executed, as we're explicitly calling it. Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> commit 98bcd1f5b1023b9eb219589c809fb2505079965d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Oct 4 18:13:09 2007 -0500 Fix -Sy and -Sp operations. When the -Sy operation failed, the lock wasn't removed because alpm_trans_release wasn't called. This is fixed now. Also, after my last change in commit 52e7e6d74733f7a431376a9e528c4fe4d3732068 , Sp didn't do anything anymore. That's because needs_transaction returned false for -Sp, so the sync transaction wasn't run. However, the current implementation of -Sp requires a sync transaction. Also, since a transaction creates the lock file at the beginning, and releases it at the end, this mean that -Sp requires root access anyway.. I think I understand now why Aaron found that the current -Sp implementation is hackish :) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> commit 02ec82b8c6fb2b2b89df92d79e9f8a28ce093cbe Author: Nathan Jones <nathanj(a)insightbb.com> Date: Thu Oct 4 17:50:29 2007 -0500 makepkg: Fix typo to make xdelta creation work. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> ----------------------------------------------------------------------- Diffstat: etc/pacman.d/mirrorlist.in | 1 + lib/libalpm/Makefile.am | 2 +- lib/libalpm/db.c | 4 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 22 +++++-- lib/libalpm/remove.c | 2 +- lib/libalpm/sync.c | 6 +- lib/libalpm/trans.c | 30 +++++++++- lib/libalpm/util.h | 2 +- pactest/tests/sync1004.py | 18 ++++++ scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 5 ++ src/pacman/callback.c | 123 ++++++++++++----------------------------- src/pacman/conf.h | 2 - src/pacman/pacman.c | 13 +++- src/pacman/sync.c | 3 +- src/pacman/util.c | 3 +- src/pacman/util.h | 6 +- 18 files changed, 128 insertions(+), 118 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ 52e7e6d74733f7a431376a9e528c4fe4d3732068 \ 6db0562b8d3cda777650521f1205a541d0e0aa93

1 0