- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-206-g45146dc
by dan＠archlinux.org 15 Dec '10

15 Dec '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 45146dccbb94f14fb56df2999131851ff15e46b9 (commit) via ab9c0814d291db840f60073b4e63d58f932e5e64 (commit) via 6605637b5317ad82f2177cc27c5a29450a8a1ef7 (commit) via c7d332a26ad59772de5f37e855858cab97e26bb4 (commit) via 919bb6c9e00820c3930067b5985a246a455bef57 (commit) via c2a73ba989fffb59c1b8ac7edb265a996dfc184d (commit) via dbf59a6b141213b0afc962c71347eb83f8bcab73 (commit) via d1d163c5a3627675e4d063d196ea2b2255507cc8 (commit) via ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via a5e43b16052b5db0de285cb4abfbcd5dff58f7ad (commit) via 580fe21065896a1cc239db72e66107f7997b3039 (commit) via c00e05992e142219c30caf154d62d6166ae28338 (commit) via 94d3d665f0b0b4c934de73580afcb137fea9baa6 (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5f36523af9de20a8c74714da4125bb553b0fae2c (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 45146dccbb94f14fb56df2999131851ff15e46b9 Merge: ab9c081 ba45cb4 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:41:59 2010 -0600 Merge branch 'maint' commit ab9c0814d291db840f60073b4e63d58f932e5e64 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Dec 15 00:14:25 2010 -0600 Add a cushion for diskspace checking It is the minimum of 5% of disk capacity or 20 MiB on a per-partition basis. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6605637b5317ad82f2177cc27c5a29450a8a1ef7 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 13 15:44:21 2010 +1000 Document PKGEXT and SRCEXT Add some basic documentation for the PKGEXT and SRCEXT options in makepkg.conf. Fixes FS#21302. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c7d332a26ad59772de5f37e855858cab97e26bb4 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 17:45:12 2010 -0600 Reorganize fields in package struct Saves a few bytes due to padding (256 -> 248 bytes), especially on x86_64, so we get the overhead of our new hash field right back. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 919bb6c9e00820c3930067b5985a246a455bef57 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:36:02 2010 -0600 Used hashed package name in _alpm_pkg_find This results in huge gains to a lot of our codepaths since this is the most frequent method of random access to packages in a list. The gains are seen in both profiling and real life. $ pacman -Sii zvbi real: 0.41 sec -> 0.32 sec strcmp: 16,669,760 calls -> 473,942 calls _alpm_pkg_find: 52.73% -> 26.31% of time $ pacman -Su (no upgrades found) real: 0.40 sec -> 0.50 sec strcmp: 19,497,226 calls -> 524,097 calls _alpm_pkg_find: 52.36% -> 26.15% of time There is some minor risk with this patch, but most of it should be avoided by falling back to strcmp() if we encounter a package with a '0' hash value (which we should not via any existing code path). We also do a strcmp once hash values match to ensure against hash collisions. The risk left is that a package name is modified once it was originally set, but the hash value is left alone. That would probably result in a lot of other problems anyway. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c2a73ba989fffb59c1b8ac7edb265a996dfc184d Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 12:06:31 2010 -0600 When setting package name, set hash value as well Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbf59a6b141213b0afc962c71347eb83f8bcab73 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:56:32 2010 -0600 Add hash_sdbm function This is prepping for the addition of a hash field to each package to greatly speed up the string comparisons we frequently do on package name in _alpm_pkg_find. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d1d163c5a3627675e4d063d196ea2b2255507cc8 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Dec 14 11:50:50 2010 -0600 Use _alpm_pkg_find in deps search Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a5e43b16052b5db0de285cb4abfbcd5dff58f7ad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:06:42 2010 -0600 Correctly force load of package reason Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 580fe21065896a1cc239db72e66107f7997b3039 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 21:00:23 2010 -0600 Abstract has_scriptlet() to package ops struct Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c00e05992e142219c30caf154d62d6166ae28338 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:19:32 2010 -0600 Remove non-public functions from header And rename accordingly. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 94d3d665f0b0b4c934de73580afcb137fea9baa6 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 20:16:36 2010 -0600 Mark sync_db_read() as static Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- doc/makepkg.conf.5.txt | 5 +++-- lib/libalpm/be_local.c | 19 +++++++++++++++++-- lib/libalpm/be_package.c | 1 + lib/libalpm/be_sync.c | 12 ++++++++---- lib/libalpm/db.c | 6 +----- lib/libalpm/db.h | 4 ---- lib/libalpm/deps.c | 4 ++-- lib/libalpm/diskspace.c | 11 ++++++++--- lib/libalpm/package.c | 30 +++++++++++++++++------------- lib/libalpm/package.h | 33 +++++++++++++++++---------------- lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 15 files changed, 122 insertions(+), 71 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-21-gba45cb4
by dan＠archlinux.org 15 Dec '10

15 Dec '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, maint has been updated via ba45cb459084a0746e0005345b8c5483834d1ba2 (commit) via c5f6995aeb7f0622b63a736208850c9c86f38aad (commit) via 8f18798d10ab74c79dce3e0b11b5896104299d73 (commit) from 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (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 ba45cb459084a0746e0005345b8c5483834d1ba2 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:33 2010 -0600 doc/PKGBUILD: document that functions run in -e mode Caught this noted on the forums, but it is definitely worth a note in the manpage as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c5f6995aeb7f0622b63a736208850c9c86f38aad Author: Dan McGee <dan(a)archlinux.org> Date: Mon Dec 13 22:35:24 2010 -0600 Fix manpage wrap not at 80 characters Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f18798d10ab74c79dce3e0b11b5896104299d73 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 23:07:54 2010 -0600 Update news and bump versions Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 2 +- configure.ac | 4 ++-- doc/PKGBUILD.5.txt | 39 ++++++++++++++++++++++----------------- 3 files changed, 25 insertions(+), 20 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Diskspace checking thought- free space cushion
by Dan McGee 15 Dec '10

15 Dec '10

Code in question is diskspace.c, line ~300: for(i = mount_points; i; i = alpm_list_next(i)) { alpm_mountpoint_t *data = i->data; if(data->used == 1) { _alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, free %ld\n", data->mount_dir, data->max_blocks_needed, (unsigned long)data->fsp.f_bfree); if(data->max_blocks_needed > data->fsp.f_bfree) { abort = 1; } } } This does a strict check of max_blocks_needed > fsp.f_bfree. do we want to cushion this somehow, as having 1 block free could still spell disaster given logging, post-install scripts, etc.? And if so, how much? I don't want to make this something that has loads and loads of configuration- we hardcode max delta ratio at 0.7, for instance. Is 5% of total blocks, capped at something like 10 MB (in 4K blocks that would be 2560 blocks) enough? -Dan

3 4

[pacman-dev] [PATCH 0/4] Package list find performance improvements
by Dan McGee 14 Dec '10

14 Dec '10

This series of patches makes finding a package in our linked list implementation a whole lot faster, if that search is using the standard _alpm_pkg_find, which nearly all are (after the first patch). It does this by adding a hash function to util.c which is nothing too complicated and named after a publicly available algorithm. When packages are created, we fill in this hash value as soon as the pkgname is read. Finally, the _alpm_pkg_find function is rewritten to take advantage of this field, avoiding repeated strcmp() calls and only falling back to that if a hash is not available and to verify the hash value was not some sort of collision. Performance figures and numbers are available in the last patch. This actually speeds up operations by nearly 33%, so this is not a total waste of time to consider. :) Review and questions/comments/concerns welcome! -Dan Dan McGee (4): Use _alpm_pkg_find in deps search Add hash_sdbm function When setting package name, set hash value as well Used hashed package name in _alpm_pkg_find lib/libalpm/be_package.c | 1 + lib/libalpm/deps.c | 4 ++-- lib/libalpm/package.c | 16 ++++++++++++++-- lib/libalpm/package.h | 1 + lib/libalpm/util.c | 22 ++++++++++++++++++++++ lib/libalpm/util.h | 1 + 6 files changed, 41 insertions(+), 4 deletions(-) -- 1.7.3.3

5 8

[pacman-dev] [PATCH] doc/PKGBUILD: document that functions run in -e mode
by Dan McGee 14 Dec '10

14 Dec '10

Caught this noted on the forums, but it is definitely worth a note in the manpage as well. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- For maint. doc/PKGBUILD.5.txt | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index fdb868a..8bdb3c6 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -235,9 +235,11 @@ name. The syntax is: `source=('filename::url')`. build() Function ---------------- In addition to the above directives, the optional build() bash function usually -comprises the remainder of the PKGBUILD. This is directly sourced and executed by -makepkg, so anything that bash or the system has available is available for use -here. Be sure any exotic commands used are covered by `makedepends`. +comprises the remainder of the PKGBUILD. This is directly sourced and executed +by makepkg, so anything that bash or the system has available is available for +use here. The function is run in `bash -e` mode, meaning any command that exits +with a non-zero status will cause the function to exit. Be sure any exotic +commands used are covered by `makedepends`. All of the above variables such as `pkgname` and `pkgver` are available for use in the build function. In addition, makepkg defines three variables for your @@ -261,10 +263,12 @@ the build function. package() Function ------------------ -An optional package() function can be specified in addition to the build() function. -This function is run immediately after the build() function. When specified in -combination with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot -usage will be limited to running the packaging stage. An existing build() function +An optional package() function can be specified in addition to the build() +function. This function is run immediately after the build() function. The +function is run in `bash -e` mode, meaning any command that exits with a +non-zero status will cause the function to exit. When specified in combination +with the fakeroot BUILDENV option in linkman:makepkg.conf[5], fakeroot usage +will be limited to running the packaging stage. An existing build() function will be run as the user calling makepkg. Package Splitting -- 1.7.3.3

1 0

[pacman-dev] Misleading info when epoch is used
by Nagy Gabor 14 Dec '10

14 Dec '10

$ sudo pacman -Su warning: supertuxkart: local (0.6.2a-2) is newer than community (0.7rc1-1) What? First I thought that our vercmp code is buggy, but vercmp binary worked as expected. Then I figured out that my local package has epoch=1, but the epoch is unset on the community package (so this seems to be a packager bug). So the above message is simply misleading (probably this is not the only one). It would be better to switch to a default version printing: "0.6.2a-2 [epoch=1]", or "1#0.6.2a-2" etc. In fact I don't like neither force nor epoch. Epoch is just a version prefix, why don't we let the packager to workaround this (KISS)? We can introduce a new separator (now we have one: '.'), for example '#', and let the packager define his favourite pkgversion (maybe epoch in mind), like "1#0.6.2a-2". Epoch just complicates code and leads to "wtf" imho... NG

7 13

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-191-g5f36523
by dan＠archlinux.org 13 Dec '10

13 Dec '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 5f36523af9de20a8c74714da4125bb553b0fae2c (commit) via ed367fe96d36fabe4127deab99df98cdb834145a (commit) via 1ff8118212cf566607c61e2f340dc3064c67c2ac (commit) from 13a2847aa14cb7643d50ca82b00180b440e401fe (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 5f36523af9de20a8c74714da4125bb553b0fae2c Author: Bruno Widmann <bruno.widmann(a)gmail.com> Date: Wed Oct 20 08:59:34 2010 +0200 Abort db_populate if dbpath is not set Rather than segfault. Fixes FS#21345. Signed-off-by: Bruno Widmann <bruno.widmann(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed367fe96d36fabe4127deab99df98cdb834145a Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 22:42:22 2010 -0600 Update scripts/ .gitignore Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1ff8118212cf566607c61e2f340dc3064c67c2ac Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 22:41:02 2010 -0600 Create sync/ DB directory if it does not exist Rather than error out, this is easy enough. Looks quite similar to the code in be_local for creating the local directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_local.c | 3 +++ lib/libalpm/be_sync.c | 18 ++++++++++++++++++ scripts/.gitignore | 1 + 3 files changed, 22 insertions(+), 0 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Local database structure change
by Dan McGee 13 Dec '10

13 Dec '10

Everyone, The commits Allan wrote and I just pushed change the local database format. depends no longer exists; everything is now in desc. Provided in the code is a 'pacman-db-upgrade' script to help you guys out if you upgrade, so be sure to run it if running pacman-git. -Dan On Sun, Dec 12, 2010 at 10:03 PM, Dan McGee <dan(a)archlinux.org> wrote: > 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". > > commit d98bacd4ec4289750e740b2dff8c4adaaa7a028a > Author: Allan McRae <allan(a)archlinux.org> > Date: Wed Dec 8 22:16:37 2010 +1000 > > Add script to update pacman database format > > The pacman-db-upgrade script was added to detect old pacman database > formats and upgrade them. > > Currently performs the merging of depends files into desc files in > the local database. > > Signed-off-by: Allan McRae <allan(a)archlinux.org> > Signed-off-by: Dan McGee <dan(a)archlinux.org> > > commit 21833d90e26635fdd2c6af247790a9bf374b4d80 > Author: Allan McRae <allan(a)archlinux.org> > Date: Sat Oct 30 15:35:43 2010 +1000 > > Merge desc and depends files in local db > > Whenever depends is needed from the local db, so is desc. The only > disadvantage to merging them is the additional time taken to read the > depends entries when they are not needed. As depends is in general > relatively small, the additional time taken to read it in will be > negligable. Also, merging these files will speed up local database > access due to less file seeks. > > Signed-off-by: Allan McRae <allan(a)archlinux.org> > Signed-off-by: Dan McGee <dan(a)archlinux.org>

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-188-g13a2847
by dan＠archlinux.org 13 Dec '10

13 Dec '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 13a2847aa14cb7643d50ca82b00180b440e401fe (commit) via d98bacd4ec4289750e740b2dff8c4adaaa7a028a (commit) via 8f3b485517a401ece348a1c5166d951ec4a8a28f (commit) via 21833d90e26635fdd2c6af247790a9bf374b4d80 (commit) via 209d0643e5fd38f8add70cfb3651012993d861f1 (commit) via b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d (commit) from 3030542d10d4e87997a894a9eb63122cd2426a94 (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 13a2847aa14cb7643d50ca82b00180b440e401fe Author: Dan McGee <dan(a)archlinux.org> Date: Sun Dec 12 21:40:24 2010 -0600 pacman-optimize: ensure database directory contains local/ And also default dbpath to the one we may find in pacman.conf. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d98bacd4ec4289750e740b2dff8c4adaaa7a028a Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 8 22:16:37 2010 +1000 Add script to update pacman database format The pacman-db-upgrade script was added to detect old pacman database formats and upgrade them. Currently performs the merging of depends files into desc files in the local database. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f3b485517a401ece348a1c5166d951ec4a8a28f Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 16:01:30 2010 +1000 Update pactest suite for change in db structure Merging desc and depends files in sync and local db. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 21833d90e26635fdd2c6af247790a9bf374b4d80 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Oct 30 15:35:43 2010 +1000 Merge desc and depends files in local db Whenever depends is needed from the local db, so is desc. The only disadvantage to merging them is the additional time taken to read the depends entries when they are not needed. As depends is in general relatively small, the additional time taken to read it in will be negligable. Also, merging these files will speed up local database access due to less file seeks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 209d0643e5fd38f8add70cfb3651012993d861f1 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Oct 31 22:43:55 2008 -0500 Attempt to stop installation when we encounter problems This should hopefully address some of the concerns raised in FS#11639 with regards to continuing after filling the disk up. Add some more checks and passing of error conditions between our functions. When a libarchive warning is encountered, check if it is due to lack of disk space and if so upgrade it to an error condition. A review of other libarchive warnings suggests that these are less critical and can remain as informative warning messages at this stage. Note the presence of errors after extraction of an entire package is complete. If so, we abort the transaction to be on the safe side and keep damage to a minimum. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: make ENOSPC warning into an error] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b276a76dc9e02e1cdc227661ae4ffe97a24d9f4d Author: Dan McGee <dan(a)archlinux.org> Date: Sun Oct 12 21:08:39 2008 -0500 Turn libarchive warnings into libalpm warnings Rather than hiding these warnings, show them to the user as they happen. This will prevent things such as hiding full filesystem errors (ENOSPC) from the user as seen in FS#11639. Signed-off-by: Dan McGee <dan(a)archlinux.org> [Allan: adjust warning wording and add gettext calls] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/add.c | 80 +++++++++++++--------- lib/libalpm/be_local.c | 144 +++++++++++++++------------------------ lib/libalpm/be_package.c | 2 +- lib/libalpm/db.h | 9 +-- lib/libalpm/util.c | 2 +- scripts/Makefile.am | 3 + scripts/pacman-db-upgrade.sh.in | 121 ++++++++++++++++++++++++++++++++ scripts/pacman-optimize.sh.in | 6 +- test/pacman/pmdb.py | 62 +++++------------ test/pacman/pmpkg.py | 4 - 10 files changed, 256 insertions(+), 177 deletions(-) create mode 100644 scripts/pacman-db-upgrade.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-18-g5c8083b
by dan＠archlinux.org 13 Dec '10

13 Dec '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, maint has been updated via 5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (commit) via eedf4f4e630f98350090ef2824b0981ffb4b7a4a (commit) via bd08581d2e5c67cc084b7ccb8f67df456bbd9ada (commit) from a91250b7bb718c7e36c9784d51bdcb6e0051c259 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/be_files.c | 7 ++++--- lib/libalpm/trans.c | 2 +- po/ru.po | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- The official pacman repository

1 0