- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-122-gef32aa0
by dan＠archlinux.org 14 Oct '10

14 Oct '10

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 ef32aa0219146866b7f7e55c95afc327819dd6cf (commit) via 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 (commit) via 24d77291da93fcd5d09df2b1d1d05474616f18a5 (commit) via 5b17d8f27d9a490a461eb2946f7c209d42c5762e (commit) via fbcadebcab57d59e460368fb6ed48bba0bbfb8a1 (commit) via d39248120e4b30e56fe052dcf5973e16e482975e (commit) via e464339e3bd37e9bdb2c8d13fa29408a1123f620 (commit) via 448f78c067955d617c302f322a2dc6507cb6eb13 (commit) via 5717c7d508db463ec178a83e852dc5e89212bd15 (commit) via 149ab6b2723c41954b638cd603e5d4ac392c8659 (commit) via 4a8e396a58219fcc6d906ce7c2bb4c4b904bd64c (commit) via 5e61f077357de1767efada259aeb824bcbfe0086 (commit) via fc32faaa6ab4081e2046b2a81e4f9949af2f7282 (commit) via 5b2de3d8ecceea0eed3124e50792400adce4e95a (commit) via 6eedf06fcc224648155bc5253d6fe1975be8da00 (commit) via 96e277cfd935d680d6309311260fe79567324e9c (commit) via 0909a72000b03332c5203b16b6a4e862c0662e03 (commit) via c56b576f6fef464f82f425219ef386fe8b742899 (commit) via efbae3cfcbd8e401084cb26853bbe46120daea4d (commit) via 522ef5e981580a52ee0ffa37178d7ddf116ebd51 (commit) via b9a531c2d7e3eefab5d987d83a1cb869e1220fac (commit) via 6cebd4e6028f717663cda0af1221f3ac74d5ab9f (commit) via d1126db1281596ba8ea960bfa963e86731d28b5e (commit) via 49176461a6b476e673e232075c95f07963750f74 (commit) via a7dc3875f15f9600e011c313c8846de6af3a2c8c (commit) from 5fcb005ebd270c1ecff3403695680145253961a2 (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 ef32aa0219146866b7f7e55c95afc327819dd6cf Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 23:09:20 2010 -0500 Small tweaks after backend merge Just a few small things I noticed looking through the code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 68b50c81c79bcf01db0fd66ff523f32cc0dc67e9 Merge: 6eedf06 24d7729 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 22:46:04 2010 -0500 Merge remote branch 'allan/backend' commit 24d77291da93fcd5d09df2b1d1d05474616f18a5 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 21:18:03 2010 +1000 Only write to local repos We do not write to sync repos so kill the code for that. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b17d8f27d9a490a461eb2946f7c209d42c5762e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 15:10:26 2010 +1000 Clean-up parsing sync database Remove unnecessary parsing of fields not found in sync desc file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fbcadebcab57d59e460368fb6ed48bba0bbfb8a1 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 15:06:10 2010 +1000 Clean-up parsing local database Remove unnecessary parsing of fields not found in local desc files. Leave %FORCE% parsing as this likely will make an appearance in desc files in the future. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d39248120e4b30e56fe052dcf5973e16e482975e Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 14:57:16 2010 +1000 Remove lazy loading of deltas Local packages do not have deltas so remove lazy loading of delta information. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e464339e3bd37e9bdb2c8d13fa29408a1123f620 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 14:05:07 2010 +1000 Move and rename splitname The splitname function is a general utility function and so is better suited to util.h. Rename it to _alpm_splitname to indicate it is an internal libalpm function as was the case prior to splitting local and sync db handling. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 448f78c067955d617c302f322a2dc6507cb6eb13 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 11 13:47:18 2010 +1000 Restrict visibility of checkdbdir and get_pkgpath These functions are only needed by be_local and were only promoted to db.{h,c} as part of the splitting of handling the local and sync dbs. Move them into be_local.c and make them static again. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5717c7d508db463ec178a83e852dc5e89212bd15 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Jul 10 00:52:50 2010 +1000 Clean up all old database files and directories Clean-up the previous download location of the sync database and any old extracted sync database directories which are unneeded with the tar-db backend. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 149ab6b2723c41954b638cd603e5d4ac392c8659 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 10 15:25:45 2010 +1000 Only download sync databases As the sync databases are read directly from the tarball, we no longer need to extract them. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 4a8e396a58219fcc6d906ce7c2bb4c4b904bd64c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 10 14:49:10 2010 +1000 Parse sync database Read in package information for a tar based sync database. Do not use lazy loading for sync db. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5e61f077357de1767efada259aeb824bcbfe0086 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 9 23:31:29 2010 +1000 Populate sync db from archive Read in list of packages for sync db from tar archive. Breaks reading in _alpm_sync_db_read and a lot of pactests (which is expected as they do not handle sync db in archives...). Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc32faaa6ab4081e2046b2a81e4f9949af2f7282 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 9 20:16:15 2010 +1000 Completely separate local and sync db handling Put the db_operations struct to use and completely split the handling of the sync and local databases. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5b2de3d8ecceea0eed3124e50792400adce4e95a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 18:04:07 2010 +1000 Separate be_files into be_sync and be_local The file be_files.c is "split" to be_local.c and be_sync.c in order to achieve separate handling of sync and local databases. Some basic clean-up of functions that are only of use for local or sync databases has been performed and some rough function renaming in duplicated code has been performed to prevent compilation errors. However, most of the clean-up and final separation of sync and local db handling occurs in following patches. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6eedf06fcc224648155bc5253d6fe1975be8da00 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Oct 13 17:50:54 2010 -0500 Fix bash shell location check BASH is defined when you are actually using bash during configure, which sucks because it ends up being '/bin/sh', messing up all of our scripts. Change the name of the variable we use in configure, and also ensure we get a full path to the executable by using AC_PATH_PROGS rather than AC_CHECK_PROGS. Finally, change the variable name everywhere we use it. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 96e277cfd935d680d6309311260fe79567324e9c Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 22:56:35 2010 +1000 Move db cache handling functions These will be needed for the handling of both local and sync database caches, so put them in a common location. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0909a72000b03332c5203b16b6a4e862c0662e03 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Oct 13 17:55:55 2010 +1000 Move database handling utility functions Move splitname, checkdbdir, get_pkgpath into db.{h,c} as these will be needed to parse both the local and sync databases during the initial splitting. They will be moved out of db.{h,c} at to more appropriate locations at a later stage. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c56b576f6fef464f82f425219ef386fe8b742899 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Aug 2 14:40:04 2010 +1000 Fix documentation syntax and typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit efbae3cfcbd8e401084cb26853bbe46120daea4d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jul 10 21:06:21 2010 -0500 Initial hack at a DB operations struct It doesn't do a whole lot yet, but these type of operations will potentially be different for the DBs we load. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 522ef5e981580a52ee0ffa37178d7ddf116ebd51 Author: Dan McGee <dan(a)archlinux.org> Date: Mon May 12 07:49:01 2008 +1000 Move the cache stuff where it should be Cache bullshit only has relevance to be_files, so move it there. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: BIG rebase] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b9a531c2d7e3eefab5d987d83a1cb869e1220fac Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 16:49:01 2008 -0500 Move changelog functions to callback struct Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6cebd4e6028f717663cda0af1221f3ac74d5ab9f Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 16:00:33 2008 -0500 Complete rework of package accessor logic Hopefully we've finally arrived at package handling nirvana, or at least this commit will get us a heck of a lot closer. The former method of getting the depends list for a package was the following: 1. call alpm_pkg_get_depends() 2. this method would check if the package came from the cache 3. if so, ensure our cache level is correct, otherwise call db_load 4. finally return the depends list Why did this suck? Because getting the depends list from the package shouldn't care about whether the package was loaded from a file, from the 'package cache', or some other system which we can't even use because the damn thing is so complicated. It should just return the depends list. So what does this commit change? It adds a pointer to a struct of function pointers to every package for all of these 'package operations' as I've decided to call them (I know, sounds completely straightforward, right?). So now when we call an alpm_pkg_get-* function, we don't do any of the cache logic or anything else there- we let the actual backend handle it by delegating all work to the method at pkg->ops->get_depends. Now that be_package has achieved equal status with be_files, we can treat packages from these completely different load points differently. We know a package loaded from a zip file will have all of its fields populated, so we can set up all its accessor functions to be direct accessors. On the other hand, the packages loaded from the local and sync DBs are not always fully-loaded, so their accessor functions are routed through the same logic as before. Net result? More code. However, this code now make it roughly 52 times easier to open the door to something like a read-only tar.gz database backend. Are you still reading? I'm impressed. Looking at the patch will probably be clearer than this long-winded explanation. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: rebase and adjust] Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d1126db1281596ba8ea960bfa963e86731d28b5e Author: Dan McGee <dan(a)archlinux.org> Date: Sun May 11 12:00:18 2008 -0500 Allow local and sync db to be treated separately Implement this seemingly simple change in package.h: typedef enum _pmpkgfrom_t { - PKG_FROM_CACHE = 1, - PKG_FROM_FILE + PKG_FROM_FILE = 1, + PKG_FROM_LOCALDB, + PKG_FROM_SYNCDB } pmpkgfrom_t; which requires flushing out several assumptions from around the codebase with regards to usage of the PKG_FROM_CACHE value. Make some changes where required to allow the switch, and now the correct value should be set (via a crude hack) depending on whether a package was loaded as an entry in a local db or a sync db. This patch underwent some big rebasing from Allan and Dan. Signed-off-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 49176461a6b476e673e232075c95f07963750f74 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 7 09:39:39 2010 -0500 Unify caching concerns in package accessors Move almost all of the caching related stuff into a single #define (which should maybe even just be a static function) so we don't duplicate logic all over the place. This also makes the code a heck of a lot shorter and means further changes to this stuff don't have to touch each and every getter function. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a7dc3875f15f9600e011c313c8846de6af3a2c8c Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 12 08:26:50 2010 -0500 contrib/ follow-up work * Add a .gitignore file * Use the same 'GEN' output we have in the scripts/ Makefile when doing our edits on the .in files * Remove PKGBUILD.vim and vimprojects from our edit list, they have no need to be in the list Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 2 +- contrib/.gitignore | 9 + contrib/Makefile.am | 11 +- contrib/{PKGBUILD.vim.in => PKGBUILD.vim} | 0 contrib/bacman.in | 2 +- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 2 +- contrib/pactree.in | 2 +- contrib/{vimprojects.in => vimprojects} | 0 contrib/wget-xdelta.sh.in | 2 +- lib/libalpm/Makefile.am | 4 +- lib/libalpm/add.c | 7 +- lib/libalpm/{be_files.c => be_local.c} | 704 ++++++++++++++--------------- lib/libalpm/be_package.c | 111 +++++ lib/libalpm/be_sync.c | 440 ++++++++++++++++++ lib/libalpm/cache.c | 291 ------------ lib/libalpm/cache.h | 44 -- lib/libalpm/conflict.c | 1 - lib/libalpm/db.c | 271 ++++++++++-- lib/libalpm/db.h | 48 ++- lib/libalpm/deps.c | 1 - lib/libalpm/package.c | 417 +++++------------- lib/libalpm/package.h | 63 +++- lib/libalpm/po/POTFILES.in | 3 +- lib/libalpm/remove.c | 5 +- lib/libalpm/sync.c | 3 +- lib/libalpm/trans.c | 1 - lib/libalpm/util.c | 45 ++ lib/libalpm/util.h | 2 + scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 2 +- scripts/repo-add.sh.in | 2 +- src/pacman/sync.c | 32 +- 36 files changed, 1431 insertions(+), 1106 deletions(-) create mode 100644 contrib/.gitignore rename contrib/{PKGBUILD.vim.in => PKGBUILD.vim} (100%) rename contrib/{vimprojects.in => vimprojects} (100%) rename lib/libalpm/{be_files.c => be_local.c} (59%) create mode 100644 lib/libalpm/be_sync.c delete mode 100644 lib/libalpm/cache.c delete mode 100644 lib/libalpm/cache.h hooks/post-receive -- The official pacman repository

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-88-g46ffd34
by dan＠archlinux.org 14 Oct '10

14 Oct '10

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 46ffd342a4255916a9599692b5969ae4cd85a156 (commit) via fa933df65b9e024ec3291fcc1f995be3dc000e0c (commit) via 67068b64b9da96a0122591ede25c50ab307a1612 (commit) via 73442a7e035a7b7f8ed80261226989ae87edd3a9 (commit) via 1e0e5b2a0241d1f3e298991c0d583afb9c80baef (commit) via dff73a2a69de1c55a0ba9fe75a9f7a900e5ed15b (commit) from bef19a266bf5d80b68cab02f6a3ccc3fcedbec6d (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 46ffd342a4255916a9599692b5969ae4cd85a156 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Sat Oct 9 09:20:57 2010 +0200 CLI args: add pactest with an invalid combination Pacman should catch cases in which the passed arguments don't apply to the current operation (sync/query/...). Also see FS#20950. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fa933df65b9e024ec3291fcc1f995be3dc000e0c Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 01:05:04 2010 +0200 pactest: fix gensync gensync generated a sync.db file with PKGINFO syntax, this is not quite what pacman expects. Also the file was only added to the Server path: root/var/pub/sync/sync.db but it was not available in the normal sync db path: root/var/lib/pacman/sync/sync.db Change gensync() to generate var/lib/pacman/sync/sync.db and then copy it to var/pub/sync/sync.db (this is used by sync200 -Sy test). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 67068b64b9da96a0122591ede25c50ab307a1612 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 01:05:03 2010 +0200 pactest: use simpler method to create tar Just like in 24fc623e1a8bf905cf0367f9bd40bc5bd6034378, apply to pmdb gensync as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73442a7e035a7b7f8ed80261226989ae87edd3a9 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 7 17:53:11 2010 -0500 Only check for function if we are using libfetch We did this check unconditionally, rather than only doing it if we were actually going to build and run with libfetch. This is safe because we would have already bailed if libfetch was explicitly requested but not found. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1e0e5b2a0241d1f3e298991c0d583afb9c80baef Author: Dan McGee <dan(a)archlinux.org> Date: Thu Oct 7 15:50:29 2010 -0500 Remove use of `seq` in pactree This is not a bash builtin, so can potentially cause portability issues. Additionally, the use of it is completely unnecessary as it can all be done within bash (and done faster). $ time pactree xfwm4 >/dev/null (old version) real 0m3.245s $ time ./contrib/pactree xfwm4 >/dev/null (new version) real 0m3.042s Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dff73a2a69de1c55a0ba9fe75a9f7a900e5ed15b Author: Dan McGee <dan(a)archlinux.org> Date: Tue Oct 5 11:44:32 2010 -0500 Avoid stat call to determine is_directory if possible On Linux and OS X, we can determine if an entry obtained through a readdir() call is a directory without also having to stat it. This can save a significant number of syscalls. The performance increase isn't dramatic, but it could be on some platforms (e.g. Cygwin) so it shouldn't hurt to use this unconditionally where supported. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +++- contrib/pactree | 3 ++- lib/libalpm/be_files.c | 29 +++++++++++++++++++---------- test/pacman/pmdb.py | 37 +++++++++++++++---------------------- test/pacman/pmtest.py | 12 +++++++----- test/pacman/tests/pacman005.py | 11 +++++++++++ test/pacman/util.py | 1 + 7 files changed, 58 insertions(+), 39 deletions(-) create mode 100644 test/pacman/tests/pacman005.py hooks/post-receive -- The official pacman repository

4 6

[pacman-dev] We've broken the bash
by Dan McGee 14 Oct '10

14 Oct '10

I think this was alluded to a while back, but we are starting to show some problems with our naming scheme and bash variable/function naming rules: /usr/bin/makepkg: line 1831: declare: `package_python-xlwt': not a valid identifier With latest makepkg built from git. -Dan

4 13

[pacman-dev] tar based sync backend implemented!
by Allan McRae 13 Oct '10

13 Oct '10

Hi, I have implemented the reading directly from the db tarball for sync databases. See the patchset on by "backend" branch (http://projects.archlinux.org/users/allan/pacman.git/log/?h=backend) Some of the changes are quite big (e.g. 9 files changed, 2184 insertions, 1571 deletions), but that is mainly moving and duplicating code in the process of splitting the handling of local and sync dbs. There is still _a lot_ of clean-up to be done in the code, but it is fully functional. This breaks pactests... lots of pactests... but that is expected as the pactest suite does not understand a tar based sync db. I would like help fixing that as I get lost in the pactest code. Anyway, here is the timing for some operations. First time is with dropped caches, the second running it again with the db cached. pacman -Syy (download time ~15-20sec) old: 1m25.197s, 0m22.445s new: 0m19.391s, 0m22.084s (download speed variation...) pacman -Sl extra old: 0m6.973s, 0m0.193s new: 0m3.974s, 0m0.390s pacman -Ss pacman old: 0m11.521s, 0m0.395s new: 0m4.171s, 0m0.477s pacman -Si pacman old: 0m6.067s, 0m0.101s new: 0m1.929s, 0m0.437s echo "n" | pacman -Su (five packages to update) old: 0m17.823s, 0m0.306s new: 0m10.577s, 0m0.489s So the tar backend gets some quite significant speed gains in the uncached case, and has marginal losses when the db is cached. Note that the entire sync db is read and parsed no matter the (sync) operation. That explains the difference in the cases with the db cached. This could be adjusted to read the package list (pkgname, pkgver-pkgrel) first and read the desc/depends files for the entire db or a single package as needed but that is probably distant future stuff... Allan

1 2

[pacman-dev] [RFC] pactree rewrite in C
by Dave Reisner 13 Oct '10

13 Oct '10

The recent patchwork over the weekend inspired me to take a closer look at pactree. My first impression was that it would be a great candidate for a rewrite in C. http://www.github.com/falconindy/pactree Results are entertaining: # bash version $ time pactree -r glib2 >/dev/null real 0m2.538s user 0m1.593s sys 0m0.435s # C rewrite $ time ./pactree -r glib2 >/dev/null real 0m0.016s user 0m0.007s sys 0m0.009s I'm finding that it's even slightly more accurate than the bash version WRT to reverse dependency tracking as it's hooking into alpm's alpm_pkg_compute_required_by() instead of wandering through the file hierarchy. It's feature complete compared to the Bash version, aside from the export to graphviz. The only functional change I've made is: when walking reverse depends, don't re-walk already visited dependencies. I thought this was a logical change given the behavior of the standard dependency tracking. I'm happy to offer this up for merging if desirable. There's a few ugly bits in the code I still want to refactor -- if anyone has any comments or criticisms, they're very welcome. d

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-97-g5fcb005
by dan＠archlinux.org 12 Oct '10

12 Oct '10

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 5fcb005ebd270c1ecff3403695680145253961a2 (commit) via 827258f32ee898ed5422bc9219d9a42bd9bd2360 (commit) via 0ff2a9149711b9179d288f579c792890cd81d79b (commit) via 05f0a28932c1acab7a9ddb58435d69626dad54da (commit) via bce3c8efc7a2d187984aa0e7037307b99c217fd7 (commit) via 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a (commit) via c9179b09db405e89093c07756d8e674ff8119ea2 (commit) via 53b41afbe8c47afaa5daf94f4e66cab81bd024cd (commit) via fb79d58109ff5a55ac3cea83607eb41e70456b17 (commit) from 46ffd342a4255916a9599692b5969ae4cd85a156 (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 5fcb005ebd270c1ecff3403695680145253961a2 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:59:30 2010 +0200 CLI args: stricter/better parsing In the following, the letters SRUDQ refer to the corresponding pacman operations. Most of the work in this commit is about removing as many options as possible from the global section and moving them to where they actually belong. Additionally, --ignore{,group} are added to U and --dbonly is added to S. --dbonly added to S --asdeps moved to S/U/D --asexplicit moved to S/U/D --print-format moved to S/U/R --noprogressbar moved to S/U/R --noscriptlet moved to S/U/R --ignorepkg added to U --ignoregrp added to U -d moved to S/U/R (--nodeps) and Q (--deps) -p moved to S/U/R (--print) and Q (--file) -f moved to S/U Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 827258f32ee898ed5422bc9219d9a42bd9bd2360 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Oct 8 22:34:17 2010 +0200 CLI args: reorganize parsing Split parsing of CLI arguments into separate functions: parsearg_op (operations) parsearg_global (global options) parsearg_{database,query,remove,sync,deptest,upgrade} Organization strictly follows the manpage (even where the manpage is incorrect) - these cases will be fixed in the following commits. Switch cases are copy/pasted and statements unrelated to chosen operation are deleted. Parsing logic adjusted as follows: 1) Parse operation 2) If we can bail out early (duplicate op, help/version requested) do so 3) Parse arguments again: foreach arg: if arg is operation: continue tryparse_args_specific_to_op if unsuccessful tryparse_args_global if unsuccessful print error message and exit Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 0ff2a9149711b9179d288f579c792890cd81d79b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 11 20:20:06 2010 -0500 util: fall cleaning on single file programs * Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 05f0a28932c1acab7a9ddb58435d69626dad54da Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 02:23:16 2010 +0300 Use sysconfdir, localstatedir, BASH instead of hardcoded values This applies to contrib/ files, our scripts, and the documentation. Dan: fix 'make clean' in contrib/ directory. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit bce3c8efc7a2d187984aa0e7037307b99c217fd7 Author: Nezmer <git(a)nezmer.info> Date: Tue Oct 12 00:20:57 2010 +0300 Add .in extension to files in contrib This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7d937772313a796f4c0bff76bf1bd7d78f8ccb5a Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 18:28:35 2010 +0200 repo-add: more informative delta messages - Print an error if database entry was not found and delta entry cannot be added - More informative line when delta entry is added (oldfile -> newfile) Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c9179b09db405e89093c07756d8e674ff8119ea2 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Mon Oct 11 17:08:00 2010 +0200 repo-add: add delta generation This allows deltas to be generated at repo-add invocation time as opposed to just added to the database. It will generate the delta from the package version currently in the database. Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53b41afbe8c47afaa5daf94f4e66cab81bd024cd Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Wed Aug 18 23:53:29 2010 +0200 pactest: fix typo in ignore001 Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fb79d58109ff5a55ac3cea83607eb41e70456b17 Author: Nezmer <git(a)nezmer.info> Date: Mon Oct 11 22:16:49 2010 +0300 makepkg: Use mkfifo instead of GNU-only 'mknod <file> p' 'mknod <file> p' is apparently GNU-only. Looking at coreutils' source code, It just calls mkfifo. This one line patch should fix makepkg logging in non-GNU systems. Signed-off-by: Nezmer <git(a)nezmer.info> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 1 + contrib/Makefile.am | 33 ++- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 16 +- contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 2 +- contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 8 +- contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 10 +- contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 10 +- contrib/{zsh_completion => zsh_completion.in} | 18 +- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 30 +- doc/pacman.conf.5.txt | 12 +- scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 4 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 +- scripts/repo-add.sh.in | 36 ++- src/pacman/pacman.c | 453 +++++++++++++++-------- src/util/cleanupdelta.c | 8 +- src/util/testdb.c | 17 +- src/util/testpkg.c | 6 +- src/util/vercmp.c | 23 +- test/pacman/tests/ignore001.py | 2 +- test/pacman/tests/pacman005.py | 3 - 30 files changed, 438 insertions(+), 266 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (95%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (99%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (95%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (97%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (88%) rename contrib/{zsh_completion => zsh_completion.in} (92%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] util: fall cleaning on single file programs
by Dan McGee 12 Oct '10

12 Oct '10

* Add a bunch of static declarations where possible * Fix void functions to be proper syntax, e.g. void func(void) * Consistency fixes (such as argv references) * Remove dead str_cmp() function from testdb * Remove unneeded config.h header includes * vercmp: remove completely unnecessary string copying Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/util/cleanupdelta.c | 8 ++++---- src/util/testdb.c | 17 ++++++----------- src/util/testpkg.c | 6 ++---- src/util/vercmp.c | 23 +++++++---------------- 4 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index ffcfaba..c1ef18c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -49,7 +49,7 @@ void output_cb(pmloglevel_t level, char *fmt, va_list args) } -void checkpkgs(alpm_list_t *pkglist) +static void checkpkgs(alpm_list_t *pkglist) { alpm_list_t *i, *j; for(i = pkglist; i; i = alpm_list_next(i)) { @@ -63,7 +63,7 @@ void checkpkgs(alpm_list_t *pkglist) } } -void checkdbs(char *dbpath, alpm_list_t *dbnames) { +static void checkdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; pmdb_t *db = NULL; alpm_list_t *i; @@ -82,14 +82,14 @@ void checkdbs(char *dbpath, alpm_list_t *dbnames) { } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { char *dbpath = DBPATH; int a = 1; diff --git a/src/util/testdb.c b/src/util/testdb.c index 45a2626..28f2b2b 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -30,11 +30,6 @@ #define BASENAME "testdb" -int str_cmp(const void *s1, const void *s2) -{ - return(strcmp(s1, s2)); -} - static void cleanup(int signum) { if(alpm_release() == -1) { fprintf(stderr, "error releasing alpm: %s\n", alpm_strerrorlast()); @@ -100,7 +95,7 @@ static int db_test(char *dbpath, int local) return(ret); } -int checkdeps(alpm_list_t *pkglist) +static int checkdeps(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -119,7 +114,7 @@ int checkdeps(alpm_list_t *pkglist) return(ret); } -int checkconflicts(alpm_list_t *pkglist) +static int checkconflicts(alpm_list_t *pkglist) { alpm_list_t *data, *i; int ret = 0; @@ -135,7 +130,7 @@ int checkconflicts(alpm_list_t *pkglist) return(ret); } -int check_localdb(char *dbpath) { +static int check_localdb(char *dbpath) { char localdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -159,7 +154,7 @@ int check_localdb(char *dbpath) { return(ret); } -int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { +static int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { char syncdbpath[PATH_MAX]; int ret = 0; pmdb_t *db = NULL; @@ -190,7 +185,7 @@ cleanup: return(ret); } -void usage() { +static void usage(void) { fprintf(stderr, "usage:\n"); fprintf(stderr, "\t%s [-b <pacman db>] : check the local database\n", BASENAME); @@ -199,7 +194,7 @@ void usage() { exit(1); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int ret = 0; char *dbpath = DBPATH; diff --git a/src/util/testpkg.c b/src/util/testpkg.c index d86fb1e..6fc0ce0 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -17,8 +17,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <stdarg.h> /* va_list */ @@ -26,7 +24,7 @@ #define BASENAME "testpkg" -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +void output_cb(pmloglevel_t level, char *fmt, va_list args) { if(fmt[0] == '\0') { return; @@ -39,7 +37,7 @@ static void output_cb(pmloglevel_t level, char *fmt, va_list args) vprintf(fmt, args); } -int main(int argc, char **argv) +int main(int argc, char *argv[]) { int retval = 1; /* default = false */ pmpkg_t *pkg = NULL; diff --git a/src/util/vercmp.c b/src/util/vercmp.c index 959dc13..8a785bb 100644 --- a/src/util/vercmp.c +++ b/src/util/vercmp.c @@ -18,20 +18,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config.h" - #include <stdio.h> /* printf */ #include <string.h> /* strncpy */ #define BASENAME "vercmp" -#define MAX_LEN 255 - /* forward declaration, comes from vercmp.o in libalpm source that is linked in * directly so we don't have any library deps */ int alpm_pkg_vercmp(const char *a, const char *b); -static void usage() +static void usage(void) { fprintf(stderr, "usage: %s <ver1> <ver2>\n\n", BASENAME); fprintf(stderr, "return values:\n"); @@ -42,8 +38,8 @@ static void usage() int main(int argc, char *argv[]) { - char s1[MAX_LEN] = ""; - char s2[MAX_LEN] = ""; + const char *s1 = ""; + const char *s2 = ""; int ret; if(argc == 1) { @@ -56,16 +52,11 @@ int main(int argc, char *argv[]) usage(); return(0); } - if(argc > 1) { - strncpy(s1, argv[1], MAX_LEN); - s1[MAX_LEN -1] = '\0'; - } if(argc > 2) { - strncpy(s2, argv[2], MAX_LEN); - s2[MAX_LEN -1] = '\0'; - } else { - printf("0\n"); - return(0); + s2 = argv[2]; + } + if(argc > 1) { + s1 = argv[1]; } ret = alpm_pkg_vercmp(s1, s2); -- 1.7.3.1

1 0

[pacman-dev] [PATCH 2/2] Use sysconfdir, localstatedir, BASH instead of hard-coded values (v.2)
by Nezmer 11 Oct '10

11 Oct '10

Signed-off-by: Nezmer <git(a)nezmer.info> --- configure.ac | 1 + contrib/Makefile.am | 30 ++++++++++++++++++++++++++++-- contrib/bacman.in | 16 ++++++++-------- contrib/pacdiff.in | 2 +- contrib/pacscripts.in | 8 ++++---- contrib/pactree.in | 10 +++++----- contrib/wget-xdelta.sh.in | 10 +++++----- contrib/zsh_completion.in | 18 +++++++++--------- doc/Makefile.am | 1 + doc/makepkg.8.txt | 2 +- doc/pacman.8.txt | 4 ++-- doc/pacman.conf.5.txt | 12 ++++++------ scripts/Makefile.am | 1 + scripts/makepkg.sh.in | 2 +- scripts/pacman-optimize.sh.in | 2 +- scripts/pkgdelta.sh.in | 2 +- scripts/rankmirrors.sh.in | 4 ++-- scripts/repo-add.sh.in | 2 +- 18 files changed, 78 insertions(+), 49 deletions(-) diff --git a/configure.ac b/configure.ac index 37b26f2..115aeb1 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL AC_CHECK_PROGS([PYTHON], [python2.7 python2.6 python2.5 python2 python], [false]) +AC_CHECK_PROGS([BASH], [bash bash4 bash3], [false]) # find installed gettext AM_GNU_GETTEXT([external]) diff --git a/contrib/Makefile.am b/contrib/Makefile.am index c6243b1..f10abbf 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = \ +OURFILES = \ PKGBUILD.vim \ bacman \ bash_completion \ @@ -9,7 +9,33 @@ EXTRA_DIST = \ pactree \ vimprojects \ wget-xdelta.sh \ - zsh_completion \ + zsh_completion + +EXTRA_DIST = \ + PKGBUILD.vim.in \ + bacman.in \ + bash_completion.in \ + pacdiff.in \ + paclist.in \ + pacscripts.in \ + pacsearch.in \ + pactree.in \ + vimprojects.in \ + wget-xdelta.sh.in \ + zsh_completion.in \ README +edit = sed \ + -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ + -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@BASH[@]|$(BASH)|g' + +$(OURFILES): Makefile + @rm -f $@ $@.tmp + @cp -a $@.in $@.tmp + $(edit) $@.in >$@.tmp + @mv $@.tmp $@ + +all-am: $(OURFILES) + # vim:set ts=2 sw=2 noet: diff --git a/contrib/bacman.in b/contrib/bacman.in index 6dd7839..2a93f8b 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata @@ -67,20 +67,20 @@ fi # # Setting environmental variables # -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 fi -eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) -pac_db="${DBPath:-/var/lib/pacman/}/local" +eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) +pac_db="${DBPath:-@localstatedir@/lib/pacman/}/local" -if [ ! -r /etc/makepkg.conf ]; then - echo "ERROR: unable to read /etc/makepkg.conf" +if [ ! -r @sysconfdir@/makepkg.conf ]; then + echo "ERROR: unable to read @sysconfdir@/makepkg.conf" exit 1 fi -source "/etc/makepkg.conf" +source "@sysconfdir@/makepkg.conf" if [ -r ~/.makepkg.conf ]; then source ~/.makepkg.conf fi diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index 3f26f38..716333a 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin(a)gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 101fb15..123c79d 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package @@ -27,7 +27,7 @@ set -o errexit progname=$(basename $0) progver="0.4" -conf="/etc/pacman.conf" +conf="@sysconfdir@/pacman.conf" if [ ! -r "$conf" ]; then echo "ERROR: unable to read $conf" @@ -36,8 +36,8 @@ fi eval $(awk '/DBPath/ {print $1$2$3}' "$conf") eval $(awk '/CacheDir/ {print $1$2$3}' "$conf") -pac_db="${DBPath:-/var/lib/pacman}/local" -pac_cache="${CacheDir:-/var/cache/pacman/pkg}" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" +pac_cache="${CacheDir:-@localstatedir@/cache/pacman/pkg}" error() { local mesg=$1; shift diff --git a/contrib/pactree.in b/contrib/pactree.in index 6051724..29c6af6 100755 --- a/contrib/pactree.in +++ b/contrib/pactree.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # pactree : a simple dependency tree viewer # # Copyright (C) 2008 Carlo "carlocci" Bersani <carlocci(a)gmail.com> @@ -272,14 +272,14 @@ if [ $graphviz -eq 1 ]; then fi fi -if [ ! -r /etc/pacman.conf ]; then - echo "ERROR: unable to read /etc/pacman.conf" +if [ ! -r @sysconfdir@/pacman.conf ]; then + echo "ERROR: unable to read @sysconfdir@/pacman.conf" exit 1 else - eval $(awk '/DBPath/ {print $1$2$3}' /etc/pacman.conf) + eval $(awk '/DBPath/ {print $1$2$3}' @sysconfdir@/pacman.conf) fi -pac_db="${DBPath:-/var/lib/pacman}/local" +pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" if [ ! -d "$pac_db" ] ; then echo "ERROR: pacman database directory ${pac_db} not found" diff --git a/contrib/wget-xdelta.sh.in b/contrib/wget-xdelta.sh.in index 4656f4d..caf0171 100755 --- a/contrib/wget-xdelta.sh.in +++ b/contrib/wget-xdelta.sh.in @@ -1,7 +1,7 @@ -#!/bin/bash +#!@BASH@ -if [ -r "/etc/makepkg.conf" ]; then - source /etc/makepkg.conf +if [ -r "@sysconfdir@/makepkg.conf" ]; then + source @sysconfdir@/makepkg.conf else echo "wget-xdelta: Unable to find makepkg.conf" exit 1 @@ -30,11 +30,11 @@ new_version=$(echo $pkg_data | cut -d ' ' -f 2) base_url=${file_url%/*} # Look for the last version -for file in $(ls -r /var/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do +for file in $(ls -r @localstatedir@/cache/pacman/pkg/${pkgname}-*-*{,-$CARCH}$PKGEXT 2>/dev/null); do [[ "$file" =~ "$CARCH" ]] && arch="-$CARCH" || arch="" check_version=$(echo $file | \ sed "s|^.*/${pkgname}-$[[:alnum:]_\.]*-[[:alnum:]_\.]*$${arch}$PKGEXT$|\1|" | \ - grep -v "^/var/cache/pacman/pkg") + grep -v "^@localstatedir@/cache/pacman/pkg") [ "$check_version" = "" ] && continue diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f69fe63..1691913 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -222,20 +222,20 @@ _pacman_completions_all_groups() { _pacman_completions_all_packages() { local -a cmd packages repositories packages_long - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories - packages_long=(/var/lib/pacman/sync/${^repositories}/*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/${^repositories}/*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted packages expl "packages" compadd - "${(@)packages}" if [[ $PREFIX != */* ]] ; then - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) typeset -U repositories _wanted repo_packages expl "repository/package" compadd -S "/" $repositories else compset -P '*/' - packages_long=(/var/lib/pacman/sync/$IPREFIX*(/)) - packages=(${(o)${${packages_long/\/var\/lib\/pacman\/sync\//}#*/}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/sync/$IPREFIX*(/)) + packages=(${(o)${${packages_long#@localstatedir@/lib/pacman/sync/}#*/}%-*-*} ) typeset -U packages _wanted repo_packages expl "repository/package" compadd ${(@)packages} fi @@ -253,15 +253,15 @@ _pacman_completions_installed_groups() { # provides completions for installed packages _pacman_completions_installed_packages() { local -a cmd packages packages_long - packages_long=(/var/lib/pacman/local/*(/)) - packages=( ${${packages_long/\/var\/lib\/pacman\/local\//}%-*-*} ) + packages_long=(@localstatedir@/lib/pacman/local/*(/)) + packages=( ${${packages_long#@localstatedir@/lib/pacman/local/}%-*-*} ) compadd "$@" -a packages } # provides completions for repository names _pacman_completions_repositories() { local -a cmd repositories - repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) + repositories=(${(o)${${${(M)${(f)"$(<@sysconfdir@/pacman.conf)"}:#\[*}/\[/}/\]/}:#options}) # Uniq the array typeset -U repositories compadd "$@" -a repositories diff --git a/doc/Makefile.am b/doc/Makefile.am index 2e656f6..748eb5f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -96,6 +96,7 @@ ASCIIDOC_OPTS = \ -a pacman_version="$(REAL_PACKAGE_VERSION)" \ -a pacman_date="`date +%Y-%m-%d`" \ -a pkgdatadir=$(pkgdatadir) \ + -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) A2X_OPTS = \ diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a2fdb3f..ff0f2b6 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -53,7 +53,7 @@ Options in linkman:makepkg.conf[5]. *--config* <`/path/to/config`>:: - Use an alternate config file instead of the `/etc/makepkg.conf` default; + Use an alternate config file instead of the `{sysconfdir}/makepkg.conf` default; *-d, \--nodeps*:: Do not perform any dependency checks. This will let you override and diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index de1f51f..2656fc7 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -118,7 +118,7 @@ Options *-b, \--dbpath* <'path'>:: Specify an alternative database location (a typical default is - ``/var/lib/pacman''). This should not be used unless you know what you are + ``{localstatedir}/lib/pacman''). This should not be used unless you know what you are doing. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. @@ -151,7 +151,7 @@ Options *\--cachedir* <'dir'>:: Specify an alternative package cache location (a typical default is - ``/var/cache/pacman/pkg''). Multiple cache directories can be specified, + ``{localstatedir}/cache/pacman/pkg''). Multiple cache directories can be specified, and they are tried in the order they are passed to pacman. *NOTE*: this is an absolute path, the root path is not automatically prepended. diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 0e8426a..ecc5c74 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -35,7 +35,7 @@ NoUpgrade = etc/passwd etc/group etc/shadow NoUpgrade = etc/fstab [core] -Include = /etc/pacman.d/core +Include = {sysconfdir}/pacman.d/core [custom] Server = file:///home/pkgs @@ -57,13 +57,13 @@ Options *DBPath =* path/to/db/dir:: Overrides the default location of the toplevel database directory. A - typical default is ``/var/lib/pacman/''. Most users will not need to set + typical default is ``{localstatedir}/lib/pacman/''. Most users will not need to set this option. *NOTE*: if specified, this is an absolute path and the root path is not automatically prepended. *CacheDir =* path/to/cache/dir:: Overrides the default location of the package cache directory. A typical - default is ``/var/cache/pacman/pkg/''. Multiple cache directories can be + default is ``{localstatedir}/cache/pacman/pkg/''. Multiple cache directories can be specified, and they are tried in the order they are listed in the config file. If a file is not found in any cache directory, it will be downloaded to the first cache directory with write access. *NOTE*: this is an absolute @@ -72,7 +72,7 @@ Options *LogFile =* '/path/to/file':: Overrides the default location of the pacman log file. A typical default - is ``/var/log/pacman.log''. This is an absolute path and the root directory + is ``{localstatedir}/log/pacman.log''. This is an absolute path and the root directory is not prepended. *HoldPkg =* package ...:: @@ -147,7 +147,7 @@ Options *UseSyslog*:: Log action messages through syslog(). This will insert log entries into - ``/var/log/messages'' or equivalent. + ``{localstatedir}/log/messages'' or equivalent. *ShowSize*:: Display the size of individual packages for '\--sync' and '\--query' modes. @@ -180,7 +180,7 @@ contain a file that lists the servers for that repository. # use this repository first Server = ftp://ftp.archlinux.org/core/os/arch # next use servers as defined in the mirrorlist below -Include = /etc/pacman.d/mirrorlist +Include = {sysconfdir}/pacman.d/mirrorlist -------- During parsing, pacman will define the `$repo` variable to the name of the diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 31e8fb5..b9e3038 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -35,6 +35,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ + -e 's|@BASH[@]|$(BASH)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3a7a4d1..baabf26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!@BASH@ -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 78b2345..eb6691c 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index 1550fa1..d45678d 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 0cd4c08..3851b77 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ @@ -25,7 +25,7 @@ usage() { echo "Usage: rankmirrors [options] MIRRORFILE | URL" echo echo "Ranks pacman mirrors by their connection and opening speed. Pacman mirror" - echo "files are located in /etc/pacman.d/. It can also rank one mirror if the URL is" + echo "files are located in @sysconfdir@/pacman.d/. It can also rank one mirror if the URL is" echo "provided." echo echo "Options:" diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 8ef940d..4338011 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!@BASH@ # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file -- 1.7.3.1

1 0

[pacman-dev] [PATCH] alpm/remove.c : respect --dbonly during remove-upgrade
by Xavier Chantry 11 Oct '10

11 Oct '10

When a -Sk or -Uk operation induced a removal of an existing local package, --dbonly was not in effect and the files were all removed. Fixing this behavior was already marked as TODO in database012 pactest << TODO: I honestly think the above should NOT delete the original les, it hould upgrade the DB entry without touching anything on the file stem. E.g. this test should be the same as: pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz >> Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- doc/pacman.8.txt | 2 -- lib/libalpm/remove.c | 4 ++++ src/pacman/pacman.c | 3 +-- test/pacman/tests/database012.py | 8 +------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index f389dfd..866c5a2 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -155,8 +155,6 @@ Transaction Options (apply to '-S', '-R' and '-U') *-k, \--dbonly*:: Adds/Removes the database entry only, leaves all files in place. - On an upgrade operation, the existing package and all files - will be removed and the database entry for the new package will be added. *\--noprogressbar*:: Do not show a progress bar when downloading files. This can be useful diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index dfaba03..e0099fb 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -311,6 +311,9 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra _alpm_log(PM_LOG_DEBUG, "removing old package first (%s-%s)\n", oldpkg->name, oldpkg->version); + if(trans->flags & PM_TRANS_FLAG_DBONLY) + goto db; + /* copy the remove skiplist over */ skip_remove = alpm_list_join(alpm_list_strdup(trans->skip_remove),alpm_list_strdup(handle->noupgrade)); @@ -345,6 +348,7 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra alpm_list_free(newfiles); FREELIST(skip_remove); +db: /* remove the package from the database */ _alpm_log(PM_LOG_DEBUG, "updating database\n"); _alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname); diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 933698e..4bf2613 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -90,7 +90,6 @@ static void usage(int op, const char * const myname) printf("%s: %s {-R --remove} [%s] <%s>\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); printf(_(" -c, --cascade remove packages and all packages that depend on them\n")); - printf(_(" -k, --dbonly only remove database entries, do not remove files\n")); printf(_(" -n, --nosave remove configuration files as well\n")); printf(_(" -s, --recursive remove dependencies also (that won't break packages)\n" " (-ss includes explicitly installed dependencies too)\n")); @@ -138,7 +137,6 @@ static void usage(int op, const char * const myname) case PM_OP_SYNC: case PM_OP_UPGRADE: printf(_(" -f, --force force install, overwrite conflicting files\n")); - printf(_(" -k, --dbonly add database entries, do not install or keep existing files\n")); printf(_(" --asdeps install packages as non-explicitly installed\n")); printf(_(" --asexplicit install packages as explicitly installed\n")); printf(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); @@ -147,6 +145,7 @@ static void usage(int op, const char * const myname) /* pass through */ case PM_OP_REMOVE: printf(_(" -d, --nodeps skip dependency checks\n")); + printf(_(" -k, --dbonly only modify database entries, not package files\n")); printf(_(" --noprogressbar do not show a progress bar when downloading files\n")); printf(_(" --noscriptlet do not execute the install scriptlet if one exists\n")); printf(_(" --print only print the targets instead of performing the operation\n")); diff --git a/test/pacman/tests/database012.py b/test/pacman/tests/database012.py index a1f8698..52813ec 100644 --- a/test/pacman/tests/database012.py +++ b/test/pacman/tests/database012.py @@ -21,11 +21,5 @@ self.addrule("PKG_EXIST=dummy") self.addrule("PKG_VERSION=dummy|2.0-1") for f in lp.files: - self.addrule("!FILE_EXIST=%s" % f) -# TODO: I honestly think the above should NOT delete the original files, it -# should upgrade the DB entry without touching anything on the file system. -# E.g. this test should be the same as: -# pacman -R --dbonly dummy && pacman -U --dbonly dummy.pkg.tar.gz -#for f in lp.files: -# self.addrule("FILE_EXIST=%s" % f) + self.addrule("FILE_EXIST=%s" % f) self.addrule("!FILE_EXIST=bin/dummy2") -- 1.7.3.1

1 0

[pacman-dev] [PATCH 1/2] Add .in extension to files in contrib
by Nezmer 11 Oct '10

11 Oct '10

This is needed If we want to use sysconfdir,localstatedir and other variables. Signed-off-by: Nezmer <git(a)nezmer.info> --- contrib/{PKGBUILD.vim => PKGBUILD.vim.in} | 0 contrib/{bacman => bacman.in} | 0 contrib/{bash_completion => bash_completion.in} | 0 contrib/{pacdiff => pacdiff.in} | 0 contrib/{paclist => paclist.in} | 0 contrib/{pacscripts => pacscripts.in} | 0 contrib/{pacsearch => pacsearch.in} | 0 contrib/{pactree => pactree.in} | 0 contrib/{vimprojects => vimprojects.in} | 0 contrib/{wget-xdelta.sh => wget-xdelta.sh.in} | 0 contrib/{zsh_completion => zsh_completion.in} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename contrib/{PKGBUILD.vim => PKGBUILD.vim.in} (100%) rename contrib/{bacman => bacman.in} (100%) rename contrib/{bash_completion => bash_completion.in} (100%) rename contrib/{pacdiff => pacdiff.in} (100%) rename contrib/{paclist => paclist.in} (100%) rename contrib/{pacscripts => pacscripts.in} (100%) rename contrib/{pacsearch => pacsearch.in} (100%) rename contrib/{pactree => pactree.in} (100%) rename contrib/{vimprojects => vimprojects.in} (100%) rename contrib/{wget-xdelta.sh => wget-xdelta.sh.in} (100%) rename contrib/{zsh_completion => zsh_completion.in} (100%) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim.in similarity index 100% rename from contrib/PKGBUILD.vim rename to contrib/PKGBUILD.vim.in diff --git a/contrib/bacman b/contrib/bacman.in similarity index 100% rename from contrib/bacman rename to contrib/bacman.in diff --git a/contrib/bash_completion b/contrib/bash_completion.in similarity index 100% rename from contrib/bash_completion rename to contrib/bash_completion.in diff --git a/contrib/pacdiff b/contrib/pacdiff.in similarity index 100% rename from contrib/pacdiff rename to contrib/pacdiff.in diff --git a/contrib/paclist b/contrib/paclist.in similarity index 100% rename from contrib/paclist rename to contrib/paclist.in diff --git a/contrib/pacscripts b/contrib/pacscripts.in similarity index 100% rename from contrib/pacscripts rename to contrib/pacscripts.in diff --git a/contrib/pacsearch b/contrib/pacsearch.in similarity index 100% rename from contrib/pacsearch rename to contrib/pacsearch.in diff --git a/contrib/pactree b/contrib/pactree.in similarity index 100% rename from contrib/pactree rename to contrib/pactree.in diff --git a/contrib/vimprojects b/contrib/vimprojects.in similarity index 100% rename from contrib/vimprojects rename to contrib/vimprojects.in diff --git a/contrib/wget-xdelta.sh b/contrib/wget-xdelta.sh.in similarity index 100% rename from contrib/wget-xdelta.sh rename to contrib/wget-xdelta.sh.in diff --git a/contrib/zsh_completion b/contrib/zsh_completion.in similarity index 100% rename from contrib/zsh_completion rename to contrib/zsh_completion.in -- 1.7.3.1

2 4