- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-26-g5b51dbb
by dan＠archlinux.org 23 Aug '08

23 Aug '08

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 5b51dbb11e2087e1055be24b486502be806b5e13 (commit) via e760c4f4784c7e7b59717cd10c56dac04f175b73 (commit) via 081f64aea3aa7df13f1ccd1da601075abab6b1ba (commit) via 0969c2e700c6bd7f855ddfa4e73b6ccd71911ff5 (commit) via 56f0cf9d157bc2b902e4590364e2926c2f169b05 (commit) via 96e023c7bd0b1069878667278a45a34476c42472 (commit) via e27a8c9ae323c275b0c3503d6a6ea18b639f4dc6 (commit) via 9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90 (commit) via 901e4aa5c203f605e9d527e474821426a40e5cea (commit) via 282eeadc68fec1da8651d0c65ad0dfebd11a9c7f (commit) from 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (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 5b51dbb11e2087e1055be24b486502be806b5e13 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Sat May 31 15:06:30 2008 +0200 Cleanup of _alpm_pkg_compare_versions. * Change the return values to be more informative. It was previously boolean, only indicating if a sync package was newer than a local package. Now it is a simple wrapper to vercmp, handling the force flag. * Remove the verbose output from _alpm_pkg_compare_versions. The "force" message is not so useful. The "package : local (v1) is newer than repo (v2)" message can be moved to -Su operation. For the -S operation, it is better to have something like : "downgrading package from v1 to v2" * Don't display the "up to date -- skipping" and "up to date -- reinstalling" messages, when the local version is newer than the sync one. * Fix the behavior of --needed option to not skip a target when the local version is newer, and clarify its description. * Add a new alpm_pkg_has_force function This allows us to access the pkg->force field like any other package fields. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e760c4f4784c7e7b59717cd10c56dac04f175b73 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 20 23:17:02 2008 +0200 download : disable progressbar when total is unknown. This is a work around for FS#8725. There are some bad combination of proxies and mirrors where the Content Length is not returned, and thus the progress bar can't be displayed correctly. Dan: Note that this patch also adds a "downloading" message when the progress bar is disabled, which was formerly not indicated at all in the output. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 081f64aea3aa7df13f1ccd1da601075abab6b1ba Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Aug 21 09:09:16 2008 +0200 fix HACKING asciidoc file. The HACKING file seemed to be broken : http://archlinux.org/pacman/HACKING.html And indeed, running asciidoc HACKING issued a number of warnings : WARNING: HACKING: line 27: missing [paradef-default] C-style entry type: numbered : expected 1 got 3 WARNING: HACKING: line 44: list item 3 out of sequence WARNING: HACKING: line 49: missing [paradef-default] C-style entry type: numbered : expected 2 got 4 WARNING: HACKING: line 62: list item 4 out of sequence type: numbered : expected 3 got 5 WARNING: HACKING: line 69: list item 5 out of sequence type: numbered : expected 4 got 6 WARNING: HACKING: line 75: list item 6 out of sequence type: numbered : expected 5 got 7 WARNING: HACKING: line 83: list item 7 out of sequence WARNING: HACKING: line 104: missing [paradef-default] C-style entry WARNING: HACKING: line 116: missing [paradef-default] C-style entry WARNING: HACKING: line 126: missing [paradef-default] C-style entry I just followed the syntax example there : http://www.methods.co.nz/asciidoc/userguide.html#X56 And all is fine now :) Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0969c2e700c6bd7f855ddfa4e73b6ccd71911ff5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Aug 7 19:50:07 2008 +0200 pacman : clarify help message. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 56f0cf9d157bc2b902e4590364e2926c2f169b05 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 17 22:35:35 2008 +0200 makepkg : localize the Y/n part of the question. pacman already localizes the yesno stuff, so doing the same in makepkg is more consistent. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 96e023c7bd0b1069878667278a45a34476c42472 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:35:21 2008 +0200 pacman: print optdepends on install and upgrade. This implements FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e27a8c9ae323c275b0c3503d6a6ea18b639f4dc6 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Jul 31 15:58:25 2008 +0200 Add new list_display_linebreak function list_display puts several members on the same line, which is not appropriate for optdepends: Optdepends: foo: feature1 bar: feature2 baz: feature3 The new list_display_linebreak function puts every member on its own line, which is much better with optdepends: Optdepends: foo: feature1 bar: feature2 baz: feature3 Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Xav: implement this new behavior as a new function rather than as a parameter of list_display] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9451b2e4f23a3c566fcfe3420c379b3cb3eb1f90 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Thu Jul 31 13:38:30 2008 +0200 Move the the description parsing logic to string_display() So dump_pkg_full will indent all strings correctly. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> [Xav: add string_length function] Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 901e4aa5c203f605e9d527e474821426a40e5cea Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Fri Aug 22 13:54:15 2008 +0200 makepkg: do insensitive comparisons of checksums. This fixes FS#11283 , which was originally reported on the forums : http://bbs.archlinux.org/viewtopic.php?id=53794 Insensitive comparisons were implicitly made before since md5sum --status was used for checking. Now that we use openssl and compare checksums manually in bash, we lost that feature. This can be easily reintroduced using tr '[A-F]' '[a-f]' What convinced me to fix it is that the md5 command line tool generates md5sums in upper case by default : http://www.fourmilab.ch/md5/ And finally, A-F and a-f are the same in hex and both are used. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 282eeadc68fec1da8651d0c65ad0dfebd11a9c7f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Aug 19 23:29:56 2008 -0500 Factor shell script size command into configure script Commit 149839c5391e9a93 introduced a small behavior regression as a drawback for a better portability. repo-add now includes the approximate size (to the nearest KB) rather than an exact size due to the switching of the du command to a more portable form. Instead of sacrificing the exact size, use configure to help us determine a valid command to acquire our filesize and place it in the sync database. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: HACKING | 36 +++++++++--------- configure.ac | 7 +++ doc/pacman.8.txt | 2 +- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 38 +++++++++--------- lib/libalpm/sync.c | 30 ++++++++++---- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 11 +++-- scripts/repo-add.sh.in | 4 +- src/pacman/callback.c | 7 +++- src/pacman/package.c | 20 +-------- src/pacman/pacman.c | 7 ++- src/pacman/util.c | 98 +++++++++++++++++++++++++++++++++++------------ src/pacman/util.h | 2 + 14 files changed, 165 insertions(+), 99 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] bogus reinstalling message
by Xavier 22 Aug '08

22 Aug '08

This issue has been known for ages, and it is easy to fix it, so I would like to do it. http://archlinux.org/pipermail/pacman-dev/2008-May/011885.html Example of a bogus output taken from the forums (the thread does not talk about this issue though) : http://bbs.archlinux.org/viewtopic.php?pid=343166#p343166 My attached solution simply removes the messages, which are in my opinion useless. But I asked if it was a problem here : http://archlinux.org/pipermail/pacman-dev/2008-June/012095.html If this is a problem, the rest of my patch will allow me to easily reintroduce these messages when they are relevant.

3 6

[pacman-dev] package file hooks
by Xavier 21 Aug '08

21 Aug '08

I was recently considering to implement package file hooks. Quote from TODO.aaron : -------------------------------------------------------------------------------------------------------------- * feature for 3.1: package file hooks * I've been planning on this one for some time. Here's a simple rundown: in /etc/pacman.d/hooks: Hook /usr/include/* : /usr/bin/ctags -R /usr/include/*.h -f /usr/include/systags This will allow us to make "global hooks" to simplify a lot of repetitive install files (scrollkeeper, depmod, etc). This also allows us to move ldconfig out of pacman entirely. possible: /etc/pacman.hooks/* files for hooks, so packages can add them too -------------------------------------------------------------------------------------------------------------- It would allow cleaning up a number of repetitive tasks in scriptlets, and could be a nicer alternative to the function libraries idea (http://bugs.archlinux.org/task/10375) Though I didn't think much about it. But today I felt on this : http://www.linux.com/feature/144666 And this looks great, this feature might not even need to be implemented in pacman. But well, I don't know how well it would work in practice. It is just an idea to discuss about.

2 2

[pacman-dev] pacman tag support
by Xavier 21 Aug '08

21 Aug '08

In answer to http://www.archlinux.org/pipermail/arch-dev-public/2008-August/007644.html To Ronald : It is nice you worked on this, especially considering it was a feature request posted by Aaron himself : http://bugs.archlinux.org/task/7132 However, I warmly recommend you to have a look at this : http://wiki.archlinux.org/index.php/Pacman_Development Especially the submitting patches page. And all the git guides. 1) you should really use git for doing pacman development 2) it it is a good idea to split patches, especially huge ones like this 3) all pacman development happens on pacman-dev, not arch-dev-public 4) all big patches go through the ML for review and discussion. Even Dan sometimes sends his own patches (the less trivial ones) there To everyone : About the feature itself, here is the last thread where it was discussed : http://archlinux.org/pipermail/pacman-dev/2007-June/008555.html I was always divided about it. I understand the point of view "groups are installable, categories are not" However, after having a look at this patch, it seems like it justifies Nagy's opinion even more : http://archlinux.org/pipermail/pacman-dev/2007-June/008565.html This category implementation basically looks like a duplication of the whole group implementation.

5 6

[pacman-dev] 3.2.1 release
by Xavier 20 Aug '08

20 Aug '08

While there is nothing critical, all bugfixes already fixed in git are nice to have, but there are especially two that keep getting reported : makepkg: fix download functions with weird urls http://projects.archlinux.org/?p=pacman.git;a=commit;h=9bc799ec7b1718e6d90c… Fix creation of source package with local source files http://projects.archlinux.org/?p=pacman.git;a=commit;h=57bd8974c73571d82761… So the sooner, the better :) The only pending patches are the following ones : pacman/callback.c : fix detection of totaldownload http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commit;h=4f56… Fix error when sourcing profile script http://dev.archlinux.org/~allan/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff… And eventually this one : Allow sync200 pactest to pass without libdownload. http://shining.toofishes.net/gitweb/gitweb.cgi?p=pacman.git;a=commitdiff;h=… This last one also shows how to use curl as XferCommand in pacman.conf, which is nice because it handles file:// protocol.

4 8

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.2.0-16-g9609c0f
by dan＠archlinux.org 20 Aug '08

20 Aug '08

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, maint has been updated via 9609c0f1351a73e06edcfda1494a41d66c51dcb5 (commit) via 6417ac129def4474270cf2716826a83615748068 (commit) via 729651a55473f6e64c4dc95888efbe2e4c76efa0 (commit) via 232b838a54e689800267e1b98ace207bd442b8cd (commit) via fb5c5086e123690a113c0e8dc85848aa2ba61f54 (commit) via a28b8e187fed67b92a0fb7aeba11b81ff5a24281 (commit) via 89c2c51964d5e4f297e767befb56a65c18dc3d6f (commit) via a23fc08758cbbc7aa861eee2f537d4e1048bb039 (commit) from 57bd8974c73571d827617f4df0a6917f13696493 (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 9609c0f1351a73e06edcfda1494a41d66c51dcb5 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Thu Jul 31 16:53:28 2008 +0200 repo-add: add optdepends to the sync database. See FS#10630. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6417ac129def4474270cf2716826a83615748068 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Tue Jan 15 11:50:46 2008 +0100 repo-add: Fix whitespaces handling in variables. repo-add didn't handle whitespaces nicely in fields value, and this has hurt us several times, first with provision version (FS#9171) and then with optdepends (FS#10630), so it is time to fix it. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 729651a55473f6e64c4dc95888efbe2e4c76efa0 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun Aug 17 21:26:49 2008 +0200 Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 232b838a54e689800267e1b98ace207bd442b8cd Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Tue Aug 19 01:02:40 2008 +0200 libalpm/add.c : ensure the old pkg was fully loaded. This fixes FS#11218. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb5c5086e123690a113c0e8dc85848aa2ba61f54 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 15:34:29 2008 +0200 pacman.c: fix typo s/NoPassiveFTP/NoPassiveFtp This fixes FS#11203. The doc has always mentioned NoPassiveFtp, but an inconsistency was introduced with commit 76f816b9f764434d02e90207ee4656ebae2b6a8c when case sensitive comparision was introduced, and was only found after commit b3e6cf652c9e989badaf5499abb1d64c1a110927 which dropped the case insensitive comparison. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a28b8e187fed67b92a0fb7aeba11b81ff5a24281 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Aug 13 23:32:52 2008 +0200 pacman.conf : add curl example for XferCommand. curl is likely to be available on the majority of systems and supports the file:// protocol. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 89c2c51964d5e4f297e767befb56a65c18dc3d6f Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Mon Aug 11 23:32:36 2008 +0200 pacman/callback.c : fix detection of totaldownload This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a23fc08758cbbc7aa861eee2f537d4e1048bb039 Author: Allan McRae <allan(a)archlinux.org> Date: Tue Aug 12 01:26:39 2008 +1000 Fix error when sourcing profile script With the "set -e" property set, a failure when sourcing /etc/profile can cause makepkg to exit without error message. The bash-completion package activates this bug. Fixes FS#11179. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/pacman.conf.in | 1 + lib/libalpm/add.c | 3 +++ lib/libalpm/util.c | 12 ++---------- scripts/makepkg.sh.in | 3 +++ scripts/repo-add.sh.in | 21 +++++++++++---------- src/pacman/callback.c | 4 ++-- src/pacman/pacman.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk()
by Nagy Gabor 17 Aug '08

17 Aug '08

From 7e7e2b74ff03dc0656879ed9ae6f171a82194ea4 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 21:26:49 +0200 Subject: [PATCH] Remove an usused variable from alpm/util.c/_alpm_lckmk() Probably a tweakable "lockdb-retry" option was planned which is not implemented. (Now it should be implemented in front-end.) So now this variable was unused and caused a small memleak. (FREE(dir) was not reached in case of error.) Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/util.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 2847db7..b26c970 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -241,7 +241,7 @@ char *_alpm_strreplace(const char *str, const char *needle, const char *replace) /* Create a lock file */ int _alpm_lckmk() { - int fd, count = 0; + int fd; char *dir, *ptr; const char *file = alpm_option_get_lockfile(); @@ -252,17 +252,9 @@ int _alpm_lckmk() *ptr = '\0'; } _alpm_makepath(dir); - - while((fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000)) == -1 && errno == EACCES) { - if(++count < 1) { - sleep(1); - } else { - return(-1); - } - } - FREE(dir); + fd = open(file, O_WRONLY | O_CREAT | O_EXCL, 0000); return(fd > 0 ? fd : -1); } -- 1.5.6.5

1 0

[pacman-dev] [PATCH] Move -Sp implementation to the front-end
by Nagy Gabor 17 Aug '08

17 Aug '08

From b6518fd82b2d3fb9dd0dc2541eb5010f2ac80870 Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:42:35 +0200 Subject: [PATCH] Move -Sp implementation to the front-end This patch kills one of our hackish pseudo transactions: PRINTURIS. (The other one is -Sw) From now on, front-end must not call trans_commit in case of -Sp, it should print the uris of target packages "by hand" instead. PRINTURIS flag was removed, NOCONFLICT flag can be passed to skip conflict checks. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 8 ++------ lib/libalpm/sync.c | 46 +++++++++++++++++++--------------------------- src/pacman/callback.c | 3 --- src/pacman/conf.h | 1 + src/pacman/pacman.c | 3 ++- src/pacman/sync.c | 41 +++++++++++++++++++++++++---------------- 6 files changed, 49 insertions(+), 53 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 4ea03a9..71c08e4 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -282,7 +282,7 @@ typedef enum _pmtransflag_t { PM_TRANS_FLAG_DOWNLOADONLY = 0x200, PM_TRANS_FLAG_NOSCRIPTLET = 0x400, PM_TRANS_FLAG_NOCONFLICTS = 0x800, - PM_TRANS_FLAG_PRINTURIS = 0x1000, + /* 0x1000 flag can go here */ PM_TRANS_FLAG_NEEDED = 0x2000, PM_TRANS_FLAG_ALLEXPLICIT = 0x4000, PM_TRANS_FLAG_UNNEEDED = 0x8000, @@ -364,14 +364,10 @@ typedef enum _pmtransevt_t { * A line of text is passed to the callback. */ PM_TRANS_EVT_SCRIPTLET_INFO, - /** Print URI. - * The database's URI and the package's filename are passed to the callback. - */ - PM_TRANS_EVT_PRINTURI, /** Files will be downloaded from a repository. * The repository's tree name is passed to the callback. */ - PM_TRANS_EVT_RETRIEVE_START, + PM_TRANS_EVT_RETRIEVE_START } pmtransevt_t; /*@}*/ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7a577a1..d85c2dc 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -486,7 +486,7 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } /* We don't care about conflicts if we're just printing uris */ - if(!(trans->flags & (PM_TRANS_FLAG_NOCONFLICTS | PM_TRANS_FLAG_PRINTURIS))) { + if(!(trans->flags & PM_TRANS_FLAG_NOCONFLICTS)) { /* check for inter-conflicts and whatnot */ EVENT(trans, PM_TRANS_EVT_INTERCONFLICTS_START, NULL, NULL); @@ -826,32 +826,27 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) fname = alpm_pkg_get_filename(spkg); ASSERT(fname != NULL, RET_ERR(PM_ERR_PKG_INVALID_NAME, -1)); - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - EVENT(trans, PM_TRANS_EVT_PRINTURI, (char *)alpm_db_get_url(current), - (char *)fname); - } else { - if(spkg->download_size != 0) { - alpm_list_t *delta_path = spkg->delta_path; - if(delta_path) { - alpm_list_t *dlts = NULL; - - for(dlts = delta_path; dlts; dlts = dlts->next) { - pmdelta_t *d = dlts->data; - - if(d->download_size != 0) { - /* add the delta filename to the download list if - * it's not in the cache */ - files = alpm_list_add(files, strdup(d->delta)); - } - - /* keep a list of the delta files for md5sums */ - deltas = alpm_list_add(deltas, d); + if(spkg->download_size != 0) { + alpm_list_t *delta_path = spkg->delta_path; + if(delta_path) { + alpm_list_t *dlts = NULL; + + for(dlts = delta_path; dlts; dlts = dlts->next) { + pmdelta_t *d = dlts->data; + + if(d->download_size != 0) { + /* add the delta filename to the download list if + * it's not in the cache */ + files = alpm_list_add(files, strdup(d->delta)); } - } else { - /* not using deltas, so add the file to the download list */ - files = alpm_list_add(files, strdup(fname)); + /* keep a list of the delta files for md5sums */ + deltas = alpm_list_add(deltas, d); } + + } else { + /* not using deltas, so add the file to the download list */ + files = alpm_list_add(files, strdup(fname)); } } } @@ -868,9 +863,6 @@ int _alpm_sync_commit(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t **data) FREELIST(files); } } - if(trans->flags & PM_TRANS_FLAG_PRINTURIS) { - return(0); - } /* clear out value to let callback know we are done */ if(handle->totaldlcb) { diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 30e34a9..9f4b52b 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -226,9 +226,6 @@ void cb_trans_evt(pmtransevt_t event, void *data1, void *data2) case PM_TRANS_EVT_SCRIPTLET_INFO: printf("%s", (char*)data1); break; - case PM_TRANS_EVT_PRINTURI: - printf("%s/%s\n", (char*)data1, (char*)data2); - break; case PM_TRANS_EVT_RETRIEVE_START: printf(_(":: Retrieving packages from %s...\n"), (char*)data1); break; diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 9d2318d..8ea6662 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -57,6 +57,7 @@ typedef struct __config_t { unsigned short op_s_sync; unsigned short op_s_search; unsigned short op_s_upgrade; + unsigned short op_s_printuris; unsigned short group; pmtransflag_t flags; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 8b8698b..b828cfb 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -461,7 +461,8 @@ static int parseargs(int argc, char *argv[]) case 'o': config->op_q_owns = 1; break; case 'p': config->op_q_isfile = 1; - config->flags |= PM_TRANS_FLAG_PRINTURIS; + config->op_s_printuris = 1; + config->flags |= PM_TRANS_FLAG_NOCONFLICTS; break; case 'q': config->quiet = 1; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index ae3f523..7bb9ada 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -666,23 +666,32 @@ static int sync_trans(alpm_list_t *targets) goto cleanup; } - if(!(alpm_trans_get_flags() & PM_TRANS_FLAG_PRINTURIS)) { - int confirm; + /* Step 3: actually perform the operation */ + if(config->op_s_printuris) { + /* print uris */ + alpm_list_t *i; + for(i = packages; i; i = alpm_list_next(i)) { + pmpkg_t *pkg = alpm_sync_get_pkg((pmsyncpkg_t *)alpm_list_getdata(i)); + pmdb_t *db = alpm_pkg_get_db(pkg); + printf("%s/%s\n", alpm_db_get_url(db), alpm_pkg_get_filename(pkg)); + } + /* we are done */ + goto cleanup; + } - display_synctargets(packages); - printf("\n"); + display_synctargets(packages); + printf("\n"); - if(config->op_s_downloadonly) { - confirm = yesno(1, _("Proceed with download?")); - } else { - confirm = yesno(1, _("Proceed with installation?")); - } - if(!confirm) { - goto cleanup; - } - }/* else 'print uris' requested. We're done at this point */ + int confirm; + if(config->op_s_downloadonly) { + confirm = yesno(1, _("Proceed with download?")); + } else { + confirm = yesno(1, _("Proceed with installation?")); + } + if(!confirm) { + goto cleanup; + } - /* Step 3: actually perform the installation */ if(alpm_trans_commit(&data) == -1) { pm_fprintf(stderr, PM_LOG_ERROR, _("failed to commit transaction (%s)\n"), alpm_strerrorlast()); @@ -739,7 +748,7 @@ int pacman_sync(alpm_list_t *targets) alpm_list_t *sync_dbs = NULL; /* Display only errors with -Sp and -Sw operations */ - if(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS)) { + if((config->flags & PM_TRANS_FLAG_DOWNLOADONLY) || config->op_s_printuris) { config->logmask &= ~PM_LOG_WARNING; } @@ -811,7 +820,7 @@ int pacman_sync(alpm_list_t *targets) } alpm_list_t *targs = alpm_list_strdup(targets); - if(!(config->flags & (PM_TRANS_FLAG_DOWNLOADONLY | PM_TRANS_FLAG_PRINTURIS))) { + if(!(config->flags & PM_TRANS_FLAG_DOWNLOADONLY) && !config->op_s_printuris) { /* check for newer versions of packages to be upgraded first */ alpm_list_t *packages = syncfirst(); if(packages) { -- 1.5.6.5

2 2

[pacman-dev] [PATCH] New public alpm_pkg_get_db function
by Nagy Gabor 17 Aug '08

17 Aug '08

From 88ca14b8e7d4c53d886bc7397adbbf6c8a338c5d Mon Sep 17 00:00:00 2001 From: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sun, 17 Aug 2008 18:32:39 +0200 Subject: [PATCH] New public alpm_pkg_get_db function This function returns with the origin database of a package. Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> --- lib/libalpm/alpm.h | 1 + lib/libalpm/package.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index fbef057..4ea03a9 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -218,6 +218,7 @@ alpm_list_t *alpm_pkg_get_deltas(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_replaces(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_files(pmpkg_t *pkg); alpm_list_t *alpm_pkg_get_backup(pmpkg_t *pkg); +pmdb_t *alpm_pkg_get_db(pmpkg_t *pkg); void *alpm_pkg_changelog_open(pmpkg_t *pkg); size_t alpm_pkg_changelog_read(void *ptr, size_t size, const pmpkg_t *pkg, const void *fp); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 49238ea..4ed908f 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -409,6 +409,15 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_backup(pmpkg_t *pkg) return pkg->backup; } +pmdb_t SYMEXPORT *alpm_pkg_get_db(pmpkg_t *pkg) +{ + /* Sanity checks */ + ASSERT(pkg != NULL, return(NULL)); + ASSERT(pkg->origin == PKG_FROM_CACHE, return(NULL)); + + return(pkg->origin_data.db); +} + /** * Open a package changelog for reading. Similar to fopen in functionality, * except that the returned 'file stream' could really be from an archive -- 1.5.6.5

1 0