- Pacman-dev - lists.archlinux.org

[pacman-dev] database on separate fs and inodes
by Łukasz Wychrystenko 16 Nov '07

16 Nov '07

Hi Long story short: (before signing new bug i want to be sure) After putting /var/lib/pacman on separate fs (raid1) i just messed things a little and run out of inodes. # fsck.ext2 -pfv /dev/md1 18072 inodes used (100.00%) Most important is what pacman did. So after -Syu packages were updated and no changes in db was made. Most important is that i pacman didn't show any error msg about that. Today i trayed -Syu again i got last time installed packages list added to new one. Pacman showed only packages list and size then just quit w/o any error again. Now I'm trying to repair db and reproduce bug, but i think that quick fix for that is to make small change in pacman that first he will tray to write db entry then packages files to disk. Sorry for my 'bad' English i hope that all catch my drift.

3 4

[pacman-dev] [PATCH] Two memleak fixes in pacman
by Nagy Gabor 16 Nov '07

16 Nov '07

Patch attached Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 3

[pacman-dev] IgnorePkg handling
by Xavier 16 Nov '07

16 Nov '07

I just found another thing I overlooked in a patch I submitted a while ago : "Let IgnorePkg superceed the FORCE package flag" , commit 5de03497c3f. I didn't see a change Dan made one month before : "* --ignore was being ignored (haha) on sysupgrade when a package was listed as being a force upgrade. This adds a prompt to the user in this case asking what to do." , commit 4a0aac3862 . So the change I made in alpm_pkg_compare_versions made this fix from Dan in _alpm_sync_sysupgrade obsolete. This code can't be run anymore. So I don't know, maybe this commit could be reverted now?

3 5

[pacman-dev] Segmentation fault
by Nagy Gabor 15 Nov '07

15 Nov '07

Hi! Finally I could reproduce FS#8350. Some background: -this is probably not important, but my "union" sync repo is sitting on my pendrive [in the suggestive file:///p/1 path ;-], so my syncdb is always out of sync [pendrive's size-limitation] -tk is in my sync repo [/p/1], cdparanoia is not [neither of the packages is installed, both can be found in my syncdb] S_good.txt: # pacman -S cdparanoia tk --debug S_fail.txt # pacman -S cdparanoia tk --debug Hm. What's the difference?: In the first case tk is in my /var/cache, so pacman tries to download only cdparanoia. In the second case my cache is empty (after -Scc), so pacman tries to download both (however, pacman could download tk to my cache before segfault) Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 7

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-563-g8236be9
by Dan McGee 15 Nov '07

15 Nov '07

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 8236be9fd8f97ea8cb4999cf775768bdc276e53e (commit) via 96f8faa6664714943201d86393099dbf7464abc2 (commit) via 4a835f5f53f23d3564ceb4f53b84f4b62b0074fe (commit) via b6b3b0135edd7bf0fae43bfe522e41cfa5eb0d9b (commit) via 434ea5bf619cd27d99d4b443fe058bf46cc5d7b2 (commit) via cc15d29db22bbc0815c4fb1f50a0e7ba53500a39 (commit) via 2898ccb609da38cf4e7b62d83b88f56396515120 (commit) via 7b4573d851464af53d34820769c0914f08c5ffeb (commit) via dd0275b759752a4f1f561dc490823ca289abd717 (commit) via a55a07f5ddb3ae16d4e60de75aebc2d7106db206 (commit) via 84433c880055faeaa7cf48a4f0a4fe9a7cf5ca1d (commit) via ed37d78664d2d6d036715ee0e939bfeea4a6ede6 (commit) via 6b9859995378a3419e6191df036a8d707cbb93a8 (commit) via 8ec27835f40e3df1ce409bc3d913587c474a30c3 (commit) via b206af78e0e6d2ff3324f3b2dc333d1b4e54f5b9 (commit) via 3312de65e642a7b6f2d853ce870910bddddf559d (commit) via 5c58b3d500d0971747af9a0c978ff6cfac668882 (commit) via 5cd6ffda722c79cf4689e559f214bcc27561fa5c (commit) via 6f5ee2432ccdd0a3bef742938cdd7552bc6a5c32 (commit) from 7d51882dd0afdb87fe986a7d7c672cc0be93795b (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 8236be9fd8f97ea8cb4999cf775768bdc276e53e Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 11:30:16 2007 -0600 Add a horrible little hack to get symlink001.py to pass again This really doesn't give us any regressions in behavior, so it is safe to do although quite ugly. Tell the conflict checking code to ignore symlinks to dirs so that they are not seen as conflicts. Hopefully this entire commit will get factored out soon enough. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 96f8faa6664714943201d86393099dbf7464abc2 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Nov 11 10:52:51 2007 -0600 Add two requiredby pactests One currently should succeed (006), and 005 fails. requiredby005.py is originally from Nagy Gabor <ngaba(a)petra.hos.u-szeged.hu>. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4a835f5f53f23d3564ceb4f53b84f4b62b0074fe Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 10:47:28 2007 -0600 Ensure list tail pointer is updated when we remove tail node Commit 2ee90ddae23dd86c68223c0d6c49f0b92d62429d did a special check to see if we were removing the head node, but not the tail node. Add a special case for the tail node to ensure all relevant pointers get updated. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b6b3b0135edd7bf0fae43bfe522e41cfa5eb0d9b Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Sat Nov 10 18:11:40 2007 +0100 Incorrect usage of alpm_db_whatprovides in sync.c The old code thought that alpm_db_whatprovides returns with a list of strings (package names). Signed-off-by: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 434ea5bf619cd27d99d4b443fe058bf46cc5d7b2 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Fri Nov 9 02:45:22 2007 -0600 Typo fix (sepArately) Found by Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> commit cc15d29db22bbc0815c4fb1f50a0e7ba53500a39 Author: Aaron Griffin <aaronmgriffin(a)gmail.com> Date: Fri Nov 9 02:16:08 2007 -0600 Missing quote in output Found by Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Aaron Griffin <aaronmgriffin(a)gmail.com> commit 2898ccb609da38cf4e7b62d83b88f56396515120 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 09:37:59 2007 -0600 libalpm: fix lstat wrapper to actually use newpath Commit b55abdce7aebb142ce79da3aa3645afe7693a3c4 introduced an lstat wrapper function that never dereferences paths with a trailing slash, but still called lstat on path instead of newpath. Oops! Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7b4573d851464af53d34820769c0914f08c5ffeb Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 09:36:03 2007 -0600 Remove unused and broken alpm_list_remove_node function Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dd0275b759752a4f1f561dc490823ca289abd717 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 09:28:35 2007 -0600 Add a missing newline in sync confirmation output Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a55a07f5ddb3ae16d4e60de75aebc2d7106db206 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Nov 9 08:40:09 2007 -0600 Add a symlink-based pactest This passes with both the upcoming 3.1 devel tree and the 3.0.6 pacman code. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 84433c880055faeaa7cf48a4f0a4fe9a7cf5ca1d Author: Dan McGee <dan(a)archlinux.org> Date: Fri Nov 9 00:23:25 2007 -0600 Update bash completion Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ed37d78664d2d6d036715ee0e939bfeea4a6ede6 Author: Nagy Gabor <ngaba(a)bibl.u-szeged.hu> Date: Fri Nov 9 00:01:45 2007 -0600 Update Hungarian translation Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6b9859995378a3419e6191df036a8d707cbb93a8 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Nov 8 23:59:02 2007 -0600 pacman: remove leftover help string for -Rh Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8ec27835f40e3df1ce409bc3d913587c474a30c3 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Nov 9 19:54:19 2007 -0500 Implement TotalDownload option. Setting this option will change the download progress to show the amount downloaded, download rate, ETA, and download percent of the entire download list rather than per each individual file. The progress bar is still based on the completion of the current file regardless if the TotalDownload option is set. This closes FS#7205. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit b206af78e0e6d2ff3324f3b2dc333d1b4e54f5b9 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Nov 9 19:54:18 2007 -0500 Add TotalDownload option. This will be used in the next commit. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 3312de65e642a7b6f2d853ce870910bddddf559d Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Nov 9 20:13:29 2007 -0500 Implement IgnoreGroup. This option acts as if IgnorePkg was set on each package in the group. This closes FS#1592. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5c58b3d500d0971747af9a0c978ff6cfac668882 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Fri Nov 9 20:13:28 2007 -0500 Add IgnoreGroup and --ignoregroup option. This will be used in the next commit. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5cd6ffda722c79cf4689e559f214bcc27561fa5c Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Fri Nov 9 19:43:48 2007 +0100 makeworld: gettext support Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 6f5ee2432ccdd0a3bef742938cdd7552bc6a5c32 Author: Roman Kyrylych <roman(a)archlinux.org> Date: Sun Nov 11 16:25:44 2007 +0200 makepkg: remove .pacsave files when uninstalling dependencies Signed-off-by: Roman Kyrylych <roman(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion | 22 +- doc/pacman.conf.5.txt | 9 + lib/libalpm/alpm.h | 7 +- lib/libalpm/alpm_list.c | 41 +- lib/libalpm/alpm_list.h | 1 - lib/libalpm/conflict.c | 19 +- lib/libalpm/db.c | 5 +- lib/libalpm/deps.c | 2 +- lib/libalpm/handle.c | 21 + lib/libalpm/handle.h | 1 + lib/libalpm/package.c | 32 +- lib/libalpm/package.h | 1 + lib/libalpm/server.c | 47 +- lib/libalpm/server.h | 6 +- lib/libalpm/sync.c | 27 +- lib/libalpm/util.c | 2 +- pactest/tests/{remove041.py => requiredby005.py} | 14 +- .../tests/{requiredby004.py => requiredby006.py} | 7 +- pactest/tests/symlink001.py | 20 + po/hu.po | 1023 +++++++++++--------- scripts/makepkg.sh.in | 4 +- scripts/makeworld.sh.in | 53 +- src/pacman/callback.c | 68 +- src/pacman/callback.h | 3 +- src/pacman/conf.h | 3 + src/pacman/pacman.c | 19 +- src/pacman/sync.c | 4 +- src/pacman/util.c | 1 + 28 files changed, 871 insertions(+), 591 deletions(-) copy pactest/tests/{remove041.py => requiredby005.py} (51%) copy pactest/tests/{requiredby004.py => requiredby006.py} (69%) create mode 100644 pactest/tests/symlink001.py hooks/post-receive -- The official pacman repository

7 24

[pacman-dev] [PATCH] Add VerbostListInfo Option
by Justin Lampley 15 Nov '07

15 Nov '07

Attached is a patch to add the VerboseListInfo option. This option takes the place of ShowSize as well as ShowOldVersion, which was submitted as a patch but never committed. During searches, the size of the packages are still shown, just like when ShowSize was enabled. During upgrades, the size as well as the old package version are shown in a formatted output with each package having its own line as well as each element (version, size) having its own column. The way I decided to handle printing in this format was to create a new function, formatted_list_display. This function accepts the title of the list, a list of rows with columns separated by commas, and a list of formats for the rows with the formats for each column also separated by commas. Example, the rows passed to the function would look like: lib32-gcc-libs,New,4.2.2-2,1.05 MB audacious-player,1.3.2-4,1.4.0-1,1.07 MB and the format would be something like: %-19s,%-10s,%-10s,%7s The function splits the row up by column and prints each columns with the widths specified. Since the columns are separated by commas, you can't have any commas in the rows or the format, so we may want to discuss another way to handle the formatted output. Other than the possible comma problem, this function should be usable anywhere you want to display a table of information. Example Output: --- $ src/pacman/pacman.static -Qu Checking for package upgrades... warning: xpdf: forcing upgrade to version 3.02_pl2-1 Remove: lib32-gcc Total Removed Size: 0.00 MB Targets: lib32-gcc-libs New 4.2.2-2 1.05 MB audacious-player 1.3.2-4 1.4.0-1 1.07 MB audacious-plugins 1.3.5-5.1 1.4.0-2 1.68 MB eclipse-pydev 1.3.9-1 1.3.10-1 3.39 MB fakeroot 1.7.1-3 1.8.4-1 0.06 MB glibc 2.7-4 2.7-6 10.78 MB glproto 1.4.8-1 1.4.9-1 0.02 MB hal-info 0.20071011-1 0.20071030-1 0.03 MB imagemagick 6.3.6.6-1 6.3.6.10-1 2.30 MB lib32-glibc 2.6.1-2 2.7-5 3.64 MB libarchive 2.2.6-2 2.4.0-1 0.32 MB libgphoto2 2.3.1-3 2.4.0-2 1.36 MB libmcs 0.4.1-2 0.6.0-1 0.02 MB libsamplerate 0.1.2-3 0.1.2-4 0.20 MB lincity-ng 1.1.1-1 1.1.2-1 29.16 MB lm_sensors 2.10.5-1 2.10.5-2 0.32 MB tcl 8.4.16-1 8.4.16-2 1.63 MB tk 8.4.16-1 8.4.16-2 1.40 MB ttf-dejavu 2.20-1 2.21-1 3.79 MB xf86-video-ati 6.7.195-1 6.7.195-3 3.67 MB xorg-server 1.4-4 1.4-5 7.25 MB xpdf 3.02_pl1-1 3.02_pl2-1 0.49 MB Total Download Size: 73.64 MB Total Installed Size: 91.08 MB --- Justin Lampley

3 3

[pacman-dev] [PATCH 0/2] Remove REQUIREDBY usage
by Dan McGee 15 Nov '07

15 Nov '07

This is mainly an RFC on the whole idea. Nagy, you made me think enough about it that I just went ahead and whipped something up. I'd first like to say that I did this in the quickest way possible, so there is no guarantee I did everything right. I also did nothing to optimize for efficiency. In some cases, we could be calling the alpm_pkg_compute_requiredby() function way more than we should, because I basically replaced any call to alpm_pkg_get_requiredby() with a corresponding alpm_pkg_compute_requiredby() and free(). Note that we should definitely find a way to pactest or otherwise test the computed requiredby entries. Some quick observations: $ time pacman -Qt > /dev/null (pacman 3, latest GIT release) real 0m0.084s user 0m0.020s sys 0m0.043s $ time ./src/pacman/pacman -Qt > /dev/null (with compute_requiredby switch) real 0m1.893s user 0m1.800s sys 0m0.037s Obviously a slowdown, but is it all that bad in the big scheme of things when corrupted requiredby entries no longer hurt us? Also: $ pacman -Qt > orphans-old $ ./src/pacman/pacman -Qt > orphans-new $ diff orphans-old orphans-new 5a6 > agg 2.5-2 121a123 > libnet 1.1.2.1-1 144a147 > mysql 5.0.45-1 184a188 > python-eyed3 0.6.14-1 237a242 > ttf-bitstream-vera 1.10-5 306a312 > xmlsec 1.2.10-3 At first, I was worried. Then I see that the new code is much better! openoffice-base has at least two stale entries in the requiredby fields of agg and xmlsec, while libnet is stale from being an old depend of ettercap. So yeah, this new code helps us in a lot of places (everywhere but speed). -Dan

4 25

[pacman-dev] output issues
by Dan McGee 15 Nov '07

15 Nov '07

checking package integrity... done. (2/2) checking for file conflicts [---------------------] 100% warning: directory permissions differ on var/cache/pacman/ o o o o o ] 0% filesystem: 555 package: 755 (1/2) upgrading pacman-git [---------------------] 100% (2/2) upgrading xscreensaver [---------------------] 100% Who wants to step up to the plate and fix this stuff? I'm sure Xavier can point us to the past conversations we've had on the subject, and we really should fix it. I liked the suggestion of buffering all these messages until after the progress bar reaches 100%,. Of course, this could be a hard change to make. Output functions in general need a sprucing up and/or unification. I know there are still printf("error...") type things scattered around the front end, and most of these could be replaced with a call to one of the pm_vprintf functions. -Dan

3 2

[pacman-dev] [PATCH] 2 new failing pactests.
by Nagy Gabor 15 Nov '07

15 Nov '07

Hi! I've created patches for the two pactests that I've mentioned here nowadays. I assigned add043.py-fix to myself (see also: http://www.archlinux.org/pipermail/pacman-dev/2007-November/009951.html) For trans001.py see also: http://www.archlinux.org/pipermail/pacman-dev/2007-November/009963.html Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

2 3

[pacman-dev] [PATCH] Add ShowOldVersion Option
by Justin Lampley 14 Nov '07

14 Nov '07

First of all, I just wanted to thank all of you for your hard work on pacman, I think it is one of the best package management tools out there. I have been following the list for a bit with the intent of starting to help out with the development of pacman (Or at least to try to help out anyway) so I figured I might as well dive in with a feature that I have had in mind for a while. This patch adds the option of allowing the old package version that is being updated from to be displayed. It takes advantage of the data element in the sync package struct which is populated with the currently installed version of the package. This feature can be beneficial in many ways, but mostly it is a good indicator (at least for me) of whether I should check out the change log of the program. With minor version increases, it is most likely minor updates or bug fixes, but if it is a major version increase, many things might have been changed that are worth checking up on before going through with the install. The following is some output with the ShowOldVersion option enabled as well as the ShowSize option ---- $ sudo src/pacman/pacman.static -Qu Checking for package upgrades... warning: xpdf: forcing upgrade to version 3.02_pl2-1 Remove: lib32-gcc Total Removed Size: 0.00 MB Targets: lib32-gcc-libs-4.2.2-2 [New] [1.05 MB] audacious-player-1.4.0-1 [1.3.2-4] [1.07 MB] audacious-plugins-1.4.0-2 [1.3.5-5.1] [1.68 MB] eclipse-pydev-1.3.10-1 [1.3.9-1] [3.39 MB] fakeroot-1.8.4-1 [1.7.1-3] [0.06 MB] glibc-2.7-6 [2.7-4] [10.78 MB] glproto-1.4.9-1 [1.4.8-1] [0.02 MB] hal-info-0.20071030-1 [0.20071011-1] [0.03 MB] imagemagick-6.3.6.10-1 [6.3.6.6-1] [2.30 MB] lib32-glibc-2.7-5 [2.6.1-2] [3.64 MB] libarchive-2.4.0-1 [2.2.6-2] [0.32 MB] libgphoto2-2.4.0-2 [2.3.1-3] [1.36 MB] libmcs-0.6.0-1 [0.4.1-2] [0.02 MB] libsamplerate-0.1.2-4 [0.1.2-3] [0.20 MB] lincity-ng-1.1.2-1 [1.1.1-1] [29.16 MB] lm_sensors-2.10.5-2 [2.10.5-1] [0.32 MB] tcl-8.4.16-2 [8.4.16-1] [1.63 MB] tk-8.4.16-2 [8.4.16-1] [1.40 MB] ttf-dejavu-2.21-1 [2.20-1] [3.79 MB] xf86-video-ati-6.7.195-3 [6.7.195-1] [3.67 MB] xorg-server-1.4-5 [1.4-4] [7.25 MB] xpdf-3.02_pl2-1 [3.02_pl1-1] [0.49 MB] Total Download Size: 73.64 MB Total Installed Size: 91.08 MB ---- Let me know what you think. Thanks, Justin Lampley

8 12

[pacman-dev] [PATCH] alpm_list_add == alpm_list_add_last I: recursedeps clean-up
by Nagy Gabor 14 Nov '07

14 Nov '07

Hi! Patch attached. See the patch description for details. Bye, ngaba ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 5

[pacman-dev] alpm_list.c "summary"
by Nagy Gabor 14 Nov '07

14 Nov '07

Hi! The main issues are (hopefully) fixed now (at least in Dan's repo) But: I refer to point 1. in this mail again: http://www.archlinux.org/pipermail/pacman-dev/2007-November/009902.html (I'm pretty sure that this doesn't break anything now, just for safety) And some (_subjective_) "elegance" notes: 1. There are some always-true if() stuffs in list_remove: line 312, 320, 323 2. alpm_list_msort and alpm_list_mmerge works fine with no-tail lists (well, it is designed for such lists), so the ~time-costly set tail in line 240 can be stripped out from mmerge. But then we must set tail after alpm_list_msort is finished (since this is a recursive function, we may need an alpm_list_msort wrapper to the (old) _alpm_list_msort) <- this may not worth the effort, I simply don't "like" this. Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

1 0

[pacman-dev] [PATCH] Make it easier to ignore multiple packages.
by Nathan Jones 14 Nov '07

14 Nov '07

This makes --ignore and --ignoregroup able to accept multiple packages/groups by separating each with a comma. For instance: pacman -Su --ignore kernel26,udev,glibc This was requested in the comments of FS#8054. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- src/pacman/pacman.c | 18 ++++++++++++++++-- src/pacman/util.c | 24 ++++++++++++++++++++++++ src/pacman/util.h | 1 + 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index af61ab9..52d5fff 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -314,6 +314,8 @@ static int parseargs(int argc, char *argv[]) }; while((opt = getopt_long(argc, argv, "ARUFQSTr:b:vkhscVfmnoldepituwygz", opts, &option_index))) { + alpm_list_t *list = NULL, *item = NULL; /* lists for splitting strings */ + if(opt < 0) { break; } @@ -326,7 +328,13 @@ static int parseargs(int argc, char *argv[]) } config->configfile = strndup(optarg, PATH_MAX); break; - case 1002: alpm_option_add_ignorepkg(strdup(optarg)); break; + case 1002: + list = strsplit(optarg, ','); + for(item = list; item; item = alpm_list_next(item)) { + alpm_option_add_ignorepkg((char *)alpm_list_getdata(item)); + } + FREELIST(list); + break; case 1003: /* debug levels are made more 'human readable' than using a raw logmask * here, error and warning are set in config_new, though perhaps a @@ -370,7 +378,13 @@ static int parseargs(int argc, char *argv[]) } config->have_logfile = 1; break; - case 1010: alpm_option_add_ignoregrp(strdup(optarg)); break; + case 1010: + list = strsplit(optarg, ','); + for(item = list; item; item = alpm_list_next(item)) { + alpm_option_add_ignoregrp((char *)alpm_list_getdata(item)); + } + FREELIST(list); + break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); diff --git a/src/pacman/util.c b/src/pacman/util.c index bc51427..c710f41 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -293,6 +293,30 @@ char *strreplace(const char *str, const char *needle, const char *replace) return newstr; } +/** Splits a string into a list of strings using the chosen character as + * a delimiter. + * + * @param str the string to split + * @param splitchar the character to split at + * + * @return a list containing the duplicated strings + */ +alpm_list_t *strsplit(const char *str, const char splitchar) +{ + alpm_list_t *list = NULL; + const char *prev = str; + + while((str = strchr(str, splitchar))) { + list = alpm_list_add(list, strndup(prev, str - prev)); + str++; + prev = str; + } + + list = alpm_list_add(list, strdup(prev)); + + return(list); +} + void list_display(const char *title, const alpm_list_t *list) { const alpm_list_t *i; diff --git a/src/pacman/util.h b/src/pacman/util.h index 4d17b17..931b456 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -46,6 +46,7 @@ void indentprint(const char *str, int indent); char *strtoupper(char *str); char *strtrim(char *str); char *strreplace(const char *str, const char *needle, const char *replace); +alpm_list_t *strsplit(const char *str, const char splitchar); void list_display(const char *title, const alpm_list_t *list); void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local); int yesno(char *fmt, ...); -- 1.5.3.5

3 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.0-575-g46ec9e3
by Dan McGee 14 Nov '07

14 Nov '07

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 46ec9e3548b5b567c7eb18c360f54a77b6313b12 (commit) via 70a91cbb22bb3ec88d518e2e6c43553c53cde318 (commit) via dbc2f902db2486494543f9001a10dfe9a86837f5 (commit) via c29209e7b6555b140794ffb6907fbd33f0d0aa88 (commit) via 103c3ac5a789dc0ec9855c18800a0616940351b1 (commit) via 1b2817f539eb3cd94b48b49736016e0bfedf3e49 (commit) via ec6a7d689b727d384115fcc6e48b38612c91317b (commit) via ca262623fcec32952d4a59ac3003c82c94297ce1 (commit) via 07243f74d1d4277a296c3eb23e876ed48c015e68 (commit) via 5e12d3dec99e7a506683cf625fa4344f57df0b77 (commit) via a0c908dd0da4a00cc98a46407534da67d4aee8a8 (commit) via 53fdae9a1977168767c27a54cf7e4a92394eb6a0 (commit) from 8236be9fd8f97ea8cb4999cf775768bdc276e53e (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 46ec9e3548b5b567c7eb18c360f54a77b6313b12 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Tue Nov 13 19:32:56 2007 -0500 Make it easier to ignore multiple packages. This makes --ignore and --ignoregroup able to accept multiple packages/groups by separating each with a comma. For instance: pacman -Su --ignore kernel26,udev,glibc This was requested in the comments of FS#8054. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 70a91cbb22bb3ec88d518e2e6c43553c53cde318 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Tue Nov 13 18:38:11 2007 -0500 Add help for --ignoregroup. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> [Dan: split usage line into two lines for clarity] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dbc2f902db2486494543f9001a10dfe9a86837f5 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 13 20:56:15 2007 -0600 pacman-optimize: add note saying sync would be helpful Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c29209e7b6555b140794ffb6907fbd33f0d0aa88 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Mon Nov 12 16:54:50 2007 -0500 repo-add: Ensure only adding package's deltas. repo-add was adding the delta files of any package that started with the same package name plus a hyphen. In this example, deltatest-libs delta files were added to the deltatest package: $ repo-add deltatest.db.tar.gz deltatest-1.0.2-1-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'deltatest-1.0.2-1-i686.pkg.tar.gz' -> Removing existing package 'deltatest-1.0.2-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'deltatest-1.0.2rc3-1_to_1.0.2-1-i686.delta' -> Added delta 'deltatest-libs-1.0.0-1_to_1.0.1-1-i686.delta' ==> Creating updated database file /tmp/deltatest.db.tar.gz Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 103c3ac5a789dc0ec9855c18800a0616940351b1 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 23:36:20 2007 -0600 configure: Doxygen is disabled by default; manpages are included in dist Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 1b2817f539eb3cd94b48b49736016e0bfedf3e49 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 22:48:15 2007 -0600 Enforce const correctness on dep functions and rewrite alpm_dep_get_string Add some const specifiers to the dep functions that can have them. In addition, rewrite alpm_dep_get_string to use snprintf and cover all of the bases (operators). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ec6a7d689b727d384115fcc6e48b38612c91317b Author: Dan McGee <dan(a)archlinux.org> Date: Mon Nov 12 19:10:43 2007 -0600 Return libalpm version number to being dot-separated I think I goofed this up when making the big overhaul of configure.ac. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ca262623fcec32952d4a59ac3003c82c94297ce1 Author: Nathan Jones <nathanj(a)insightbb.com> Date: Mon Nov 12 16:54:30 2007 -0500 Add pactest for IgnoreGroup. Also tell pactest to reset IgnoreGroup like it does for IgnorePkg. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 07243f74d1d4277a296c3eb23e876ed48c015e68 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Nov 13 00:12:57 2007 -0600 Update valgrind.supp to ignore ld 2.X dl_relocate Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5e12d3dec99e7a506683cf625fa4344f57df0b77 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 15:02:33 2007 -0600 Fix display of -Qip output when a package file is given Too many fields were being shown on -Qip output, and sizes were not always correct (-Qi and -Qip output on the same package did not agree). Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a0c908dd0da4a00cc98a46407534da67d4aee8a8 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 14:14:07 2007 -0600 Remove 'Total Package Size' Having 'Total Installed Size' and 'Total Download Size' makes this size unnecessary. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 53fdae9a1977168767c27a54cf7e4a92394eb6a0 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Nov 11 12:59:45 2007 -0600 Fix memleak with new alpm_list_reverse usage Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 6 ++-- doc/Makefile.am | 16 +++++---- doc/pacman.8.txt | 8 ++++- lib/libalpm/alpm.h | 12 +++--- lib/libalpm/be_files.c | 4 ++ lib/libalpm/deps.c | 58 +++++++++++++++-------------- lib/libalpm/remove.c | 6 ++- pactest/pmtest.py | 1 + pactest/tests/{sync120.py => sync138.py} | 5 ++- scripts/pacman-optimize.sh.in | 1 + scripts/repo-add.sh.in | 8 ++++- src/pacman/package.c | 3 +- src/pacman/pacman.c | 20 +++++++++- src/pacman/query.c | 7 +++- src/pacman/util.c | 44 +++++++++++++++++++---- src/pacman/util.h | 1 + valgrind.supp | 3 +- 17 files changed, 141 insertions(+), 62 deletions(-) copy pactest/tests/{sync120.py => sync138.py} (73%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/2] Add IgnoreGroup and --ignoregroup option.
by Nathan Jones 13 Nov '07

13 Nov '07

This will be used in the next commit. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- doc/pacman.conf.5.txt | 4 ++++ lib/libalpm/alpm.h | 4 ++++ lib/libalpm/handle.c | 21 +++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/pacman.c | 15 +++++++++++++++ 5 files changed, 45 insertions(+), 0 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index 06ba81d..690e3f4 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -68,6 +68,10 @@ Options Instructs pacman to ignore any upgrades for this package when performing a '\--sysupgrade'. +*IgnoreGroup =* group ...:: + Instructs pacman to ignore any upgrades for all packages in this + group when performing a '\--sysupgrade'. + *Include =* path:: Include another config file. This file can include repositories or general configuration options. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 20d7787..f8558e1 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -130,6 +130,10 @@ alpm_list_t *alpm_option_get_holdpkgs(); void alpm_option_add_holdpkg(const char *pkg); void alpm_option_set_holdpkgs(alpm_list_t *holdpkgs); +alpm_list_t *alpm_option_get_ignoregrps(); +void alpm_option_add_ignoregrp(const char *grp); +void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps); + time_t alpm_option_get_upgradedelay(); void alpm_option_set_upgradedelay(time_t delay); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index af54949..78ac117 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -100,6 +100,7 @@ void _alpm_handle_free(pmhandle_t *handle) FREELIST(handle->noextract); FREELIST(handle->ignorepkg); FREELIST(handle->holdpkg); + FREELIST(handle->ignoregrp); FREE(handle); } @@ -211,6 +212,15 @@ alpm_list_t SYMEXPORT *alpm_option_get_holdpkgs() return handle->holdpkg; } +alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps() +{ + if (handle == NULL) { + pm_errno = PM_ERR_HANDLE_NULL; + return NULL; + } + return handle->ignoregrp; +} + time_t SYMEXPORT alpm_option_get_upgradedelay() { if (handle == NULL) { @@ -461,6 +471,17 @@ void SYMEXPORT alpm_option_set_holdpkgs(alpm_list_t *holdpkgs) if(holdpkgs) handle->holdpkg = holdpkgs; } +void SYMEXPORT alpm_option_add_ignoregrp(const char *grp) +{ + handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp)); +} + +void alpm_option_set_ignoregrps(alpm_list_t *ignoregrps) +{ + if(handle->ignoregrp) FREELIST(handle->ignoregrp); + if(ignoregrps) handle->ignoregrp = ignoregrps; +} + void SYMEXPORT alpm_option_set_upgradedelay(time_t delay) { handle->upgradedelay = delay; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index 0874ecd..63a4688 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -55,6 +55,7 @@ typedef struct _pmhandle_t { alpm_list_t *noextract; /* List of packages NOT to extract */ /*TODO is this used?*/ alpm_list_t *ignorepkg; /* List of packages to ignore */ alpm_list_t *holdpkg; /* List of packages which 'hold' pacman */ + alpm_list_t *ignoregrp; /* List of groups to ignore */ /* options */ unsigned short usesyslog; /* Use syslog instead of logfile? */ /* TODO move to frontend */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 9c650f2..2f916e2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -309,6 +309,7 @@ static int parseargs(int argc, char *argv[]) {"cachedir", required_argument, 0, 1007}, {"asdeps", no_argument, 0, 1008}, {"logfile", required_argument, 0, 1009}, + {"ignoregroup", required_argument, 0, 1010}, {0, 0, 0, 0} }; @@ -369,6 +370,7 @@ static int parseargs(int argc, char *argv[]) } config->have_logfile = 1; break; + case 1010: alpm_option_add_ignoregrp(strdup(optarg)); break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); @@ -627,6 +629,19 @@ static int _parseconfig(const char *file, const char *givensection, } alpm_option_add_ignorepkg(p); pm_printf(PM_LOG_DEBUG, "config: ignorepkg: %s\n", p); + } else if(strcmp(key, "IgnoreGroup") == 0 || strcmp(upperkey, "IGNOREGROUP") == 0) { + char *p = ptr; + char *q; + + while((q = strchr(p, ' '))) { + *q = '\0'; + alpm_option_add_ignoregrp(p); + pm_printf(PM_LOG_DEBUG, "config: ignoregroup: %s", p); + p = q; + p++; + } + alpm_option_add_ignoregrp(p); + pm_printf(PM_LOG_DEBUG, "config: ignoregroup: %s\n", p); } else if(strcmp(key, "HoldPkg") == 0 || strcmp(upperkey, "HOLDPKG") == 0) { char *p = ptr; char *q; -- 1.5.3.5

4 7

[pacman-dev] -Si is laconic
by Nagy Gabor 13 Nov '07

13 Nov '07

Hi! When I made the previously posted speed tests, I noticed that -Si hides lots of info. Is there any special reason for this (we are not proud of our packagers for example;-) or we just forgot to update dump_pkg_sync in pacman/package.c? I think that dump_pkg_sync should be merged to dump_pkg_full (with a new is_local input parameter for example) to keep -Qi and -Si in sync. And this is a good time (just before the 3.1 release) to review -Qi too. I would do this, but I'm not sure that you would like an "ngaba-English" special edition of pacman :-) Bye ---------------------------------------------------- SZTE Egyetemi Könyvtár - http://www.bibl.u-szeged.hu This mail sent through IMP: http://horde.org/imp/

3 5

[pacman-dev] Backend DB [was: Hypotetic pacman's db structure]
by Aaron Griffin 13 Nov '07

13 Nov '07

On Nov 9, 2007 3:22 PM, Miklos Vajna <vmiklos(a)frugalware.org> wrote: > On Fri, Nov 09, 2007 at 05:26:01PM +0100, JJDaNiMoTh <jjdanimoth(a)gmail.com> wrote: > > I'm writing an example databe structure for pacman db ( may be useful > > when someone decide to use SQLite as backend, and not simple text > > file). [1] > > last year i writed such a structure, but it was much more complex: > > http://git.frugalware.org/gitweb/gitweb.cgi?p=vmexam.git;a=blob;f=sql/pacma… > > and to be honest i must say i agree with Aaron about using an sql-based > db for such a lowlevel purpose (pkgdb) would be something like using > curl in libpacman Hah, this is the second time you agreed with me! The sky is falling! To probe your thoughts a bit further, if the world were ideal, what kind of backend would YOU go for?

6 12

[pacman-dev] Misleading pacman man page
by Aaron Griffin 13 Nov '07

13 Nov '07

This is a man page issue that's actually got me a few times, and seems to confuse users as well. This is the pacman man page. On Nov 12, 2007 5:34 PM, Goulven Guillard <lecotegougdelaforce(a)free.fr> wrote: > Aaron Griffin a écrit : > > On Nov 12, 2007 5:21 PM, Goulven Guillard <lecotegougdelaforce(a)free.fr> wrote: > >> Aaron Griffin a écrit : > >>> For both of the bugs you posted, pacman -Rd is the solution > >> Oh, ok. Sorry, the comment was so tiny that I didn't see it. :-) > >> > >> And thanks for the tip, it seems like I misread pacman's manpage. > > > > It's in the OPTIONS section above all the other ones - it's a little > > misleading, but that section contains the common options for all > > commands. > > Yes, I agree it's misleading. But anyway I have no excuse, I have read > all the manpage... I must be tired. Basically, he didn't know about -Rd because it is not documented in the "REMOVE OPTIONS" section, but above it, and that is not really referenced anywhere. I know I've done a double take once or twice. Options: * Point out the OPTIONS section better - perhaps adding a little "See Also" at the top of each specific options section? * Remove the OPTIONS section and duplicate it in each sub section * Do nothing What do you all think?

2 1

[pacman-dev] [PATCH] repo-add: Ensure only adding package's deltas.
by Nathan Jones 12 Nov '07

12 Nov '07

repo-add was adding the delta files of any package that started with the same package name plus a hyphen. In this example, deltatest-libs delta files were added to the deltatest package: $ repo-add deltatest.db.tar.gz deltatest-1.0.2-1-i686.pkg.tar.gz ==> Extracting database to a temporary location... ==> Adding package 'deltatest-1.0.2-1-i686.pkg.tar.gz' -> Removing existing package 'deltatest-1.0.2-1'... -> Creating 'desc' db entry... -> Computing md5 checksums... -> Creating 'depends' db entry... -> Creating 'deltas' db entry... -> Added delta 'deltatest-1.0.2rc3-1_to_1.0.2-1-i686.delta' -> Added delta 'deltatest-libs-1.0.0-1_to_1.0.1-1-i686.delta' ==> Creating updated database file /tmp/deltatest.db.tar.gz Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- scripts/repo-add.sh.in | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 4dfedbe..adcefc1 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -218,7 +218,13 @@ db_write_entry() # create deltas entry if there are delta files for delta in $startdir/$pkgname-*-*_to_*-*-$arch.delta; do - if [ -f "$delta" ]; then + # This for loop also pulls in all files that start with the current package + # name and are followed by a -whatever. For instance, running this loop for + # gcc would also grab gcc-libs. To guard against this, compare the package + # name of the delta to the current package name. + local filename=$(basename "$delta") + local dpkgname="$(echo "$filename" | sed -e 's/$.*$-.*-.*_to_.*-.*-.*.delta/\1/')" + if [ "$pkgname" = "$dpkgname" -a -f "$delta" ]; then # create deltas file if it does not already exist if [ ! -f "deltas" ]; then msg2 "$(gettext "Creating 'deltas' db entry...")" -- 1.5.3.5

1 0

[pacman-dev] [PATCH] Add pactest for IgnoreGroup.
by Nathan Jones 12 Nov '07

12 Nov '07

Also tell pactest to reset IgnoreGroup like it does for IgnorePkg. Signed-off-by: Nathan Jones <nathanj(a)insightbb.com> --- pactest/pmtest.py | 1 + pactest/tests/sync138.py | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/sync138.py diff --git a/pactest/pmtest.py b/pactest/pmtest.py index 00dd3cb..e0b3fd4 100755 --- a/pactest/pmtest.py +++ b/pactest/pmtest.py @@ -84,6 +84,7 @@ class pmtest: self.option = { "noupgrade": [], "ignorepkg": [], + "ignoregroup": [], "noextract": [] } diff --git a/pactest/tests/sync138.py b/pactest/tests/sync138.py new file mode 100644 index 0000000..410c7f0 --- /dev/null +++ b/pactest/tests/sync138.py @@ -0,0 +1,22 @@ +self.description = "Sysupgrade of packages in 'IgnoreGroup'" + +sp1 = pmpkg("pkg1", "1.0-2") +sp2 = pmpkg("pkg2", "1.0-2") +sp2.groups = ["grp"] + +for p in sp1, sp2: + self.addpkg2db("sync", p) + +lp1 = pmpkg("pkg1") +lp2 = pmpkg("pkg2") + +for p in lp1, lp2: + self.addpkg2db("local", p) + +self.option["ignoregroup"] = ["grp"] + +self.args = "-Su" + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_VERSION=pkg1|1.0-2") +self.addrule("!PKG_MODIFIED=pkg2") -- 1.5.3.5

1 0

[pacman-dev] [PATCH] makepkg: remove .pacsave files when uninstalling dependencies
by Roman Kyrylych 12 Nov '07

12 Nov '07

Hi! This is a small patch that fixes this: ==> Compressing package... ==> Removing installed dependencies... ERROR: ld.so: object 'libfakeroot.so' from LD_PRELOAD cannot be preloaded: ignored. checking dependencies... done. Targets: at Do you want to remove these packages? [Y/n] warning: /etc/at.deny saved as /etc/at.deny.pacsave (1/1) removing at [#####################] 100% ==> Finished making: gnome-schedule (Sun Nov 11 16:22:29 EET 2007) -- Roman Kyrylych (Роман Кирилич)

3 3

[pacman-dev] add043.py: alpm_depcmp and provisions
by Nagy Gabor 12 Nov '07

12 Nov '07

Hi! Give a look at the following pactest: ----add043.py---- self.description = "provision>=1.0-2 needed" p1 = pmpkg("pkg1", "1.0-2") p1.depends = ["provision>=1.0-2"] self.addpkg(p1) p2 = pmpkg("pkg2", "1.0-2") p2.provides = ["provision"] self.addpkg2db("local", p2) self.args = "-A %s" % p1.filename() self.addrule("PACMAN_RETCODE=1") self.addrule("!PKG_EXIST=pkg1") self.addrule("PKG_EXIST=pkg2") ----------------- This currently fails. IMHO this is a bug: alpm_depcmp uses the package version in the "provision case" too (so if you change p1.depends to "provision<=1.0-1", then the pactest will pass.) This is a good time to ask you about versioned provisions again (before fix): Personally, I like the idea; and the implementation needs ~0 effort and would cause ~0 slowdown; and would be 100% compatible with "no-version" provisions. I don't know if package maintainers need this feature or not (someone could ask them on arch-* ML <- I'm not a subscriber there), but this is just an extra feature, they needn't use it. Bye, ngaba

3 2

[pacman-dev] lstat issue / fileconflict001 pactest
by Xavier 12 Nov '07

12 Nov '07

Following the discussion started in the comments of bug 7484, because I think it's more appropriate : http://bugs.archlinux.org/task/7484#comment20837 I recently discovered that a trailing / is very important when using lstat, for directory symlinks. In the following situation : symdir -> realdir/ lstat(symdir) stats the link itself, but lstat(symdir/) stats realdir. So lstat(symdir/) seems equivalent to stat(symdir). The archive extraction code in add.c that Dan rewrote didn't take this into consideration, so he added a new _alpm_lstat that removes the trailing / when there is one : http://projects.archlinux.org/git/?p=pacman.git;a=commit;h=b55abdce7aebb142… A little typo in _alpm_lstat (path instead of newpath) made this change not active yet. As Dan noticed, fixing this makes fileconflict001 pass. The only purpose of this mail is explaining why. So in this pactest, we have the following situation : dir/realdir/ dir/symdir -> realdir Then pkg1 installs dir/realdir/file , and pkg2 installs dir/symdir/file . Since in this case, symdir points to realdir, pkg1 and pkg2 have a fileconflict on "file". But if fileconflict001 pass after the bugfix mentioned above, it's not because pacman detects there is a package<->package conflict between dir/realdir/file and dir/symdir/file. Instead, it detects a filesystem <-> package conflict between dir/symdir/ from pkg2 (which is a real directory there), and the dir/symdir symlink on the filesystem. So that's plain wrong. The fileconflict code currently does a lstat(dir/symdir/), which doesn't stat the symdir symlink, but the real directory realdir. So it treated dir/symdir/ as a directory, and ignored it : 336 /* stat the file - if it exists, do some checks / 337 if(_alpm_lstat(path, &buf) != 0) { 338 continue; 339 } 340 if(S_ISDIR(buf.st_mode)) { 341 _alpm_log(PM_LOG_DEBUG, "%s is a directory, not a conflict\n", path); Now, with the new behavior of _alpm_lstat, the code does a lstat(dir/symdir), which stats the symlink. And the following code will treat this as a conflict. The case of fileconflict001 is probably another situation easier to detect during the transaction (coupled with a rollback system), rather than beforehand. Otherwise, maybe the file conflict code should keep using the normal lstat, instead of _alpm_lstat which removes the trailing /.

4 9

[pacman-dev] Generate doxygen man pages on "make dist"
by Aaron Griffin 12 Nov '07

12 Nov '07

Would anyone have a problem with generating doxygen man pages on the "make dist" target? The reason I ask, is that having a doxygen makedepend is breaking our little core/extra repo separation, and this is the cleanest fix. It also cleans up building pacman. If you ask me, I don't see a problem with pre-generating them Opinions?

2 2

[pacman-dev] TotalDownload option.
by Nathan Jones 12 Nov '07

12 Nov '07

Sample output: $ sudo pacman -S gcc gcc-fortran gcc-libs resolving dependencies... done. looking for inter-conflicts... done. Targets: gcc-libs-4.2.2-2 [1.06 MB] gcc-4.2.2-3 [8.92 MB] gcc-fortran-4.2.2-1 [2.91 MB] Total Package Size: 12.89 MB Total Download Size: 12.89 MB Proceed with installation? [Y/n] :: Retrieving packages from core... gcc-libs-4.2.2-2-i686 1081.1K 503.8K/s 00:00:02 [#--------------------] 8% gcc-4.2.2-3-i686 10.0M 302.1K/s 00:00:34 [################-----] 77% :: Retrieving packages from extra... gcc-fortran-4.2.2-1-... 12.9M 338.0K/s 00:00:39 [#####################] 100% checking package integrity... done. (3/3) checking for file conflicts [#####################] 100% (1/3) upgrading gcc-libs [#####################] 100% (2/3) upgrading gcc [#####################] 100% (3/3) upgrading gcc-fortran [#####################] 100%

8 20