- Pacman-dev - lists.archlinux.org

[pacman-dev] translation procedure
by Xavier 07 Jan '08

07 Jan '08

There was a discussion yesterday on irc about simplifying the translation process. Stonecrest was basically saying that having to go through git might turn off some potential translators, and confuse others. And I agree with that. Translators actually don't even need the pacman source tree, here is how the process can go : 19:53 stonecrest >> 1. release coming 2. string freeze 3. dan updates po files 4. people download po files from gitweb and update them 5. people submit them 19:54 stonecrest >> and you can continue making any changes to pacman during that process that don't change strings. So first, I would like to know the opinion of others (especially the existing translators) about this procedure. And then, I tried to update the translation-help accordingly, but I am not sure how bad my changes are, so if others could also comment on that and suggest improvements, it would be great :) Note : the patch is based on Dan's working branch since he converted translation-help to asciidoc there.

2 1

[pacman-dev] [abs] Proto files and Makeworld
by Travis Willard 07 Jan '08

07 Jan '08

Hey guys, With ABS splitting off from pacman, I was wondering where makeworld and the .proto files belonged. To me, makeworld seems to be an abs tool (and even mentions ABS in its usage) so it would seem to belong in the abs project, not with pacman itself. The proto files (PKGBUILD.proto, install.proto, and possibly a ChangeLog.proto?) seem to belong with makepkg in my mind. Any changes in these proto files would be directly caused by changes to makepkg, and the coupling of putting them in with the pacman package seems to make sense. I've never understood why we sync them with abs in the first place - if someone wants a prototype PKGBUILD to start from, why should they have to download the entirety of our repos' build scripts? In short, I think we should move makeworld to the abs project/package, and move the prototype files into the pacman project/package, perhaps in /usr/share/pacman/*proto? Thoughts? -- Travis

6 25

[pacman-dev] typo ?
by fancris3 07 Jan '08

07 Jan '08

[~]:: sudo pacman -Rd perl-html-parser loading package data... done. checking dependencies... (1/1) removing perl-html-parser [#############################################] 100% [~]:: sudo pacman -Sd perl-html-parser looking for inter-conflicts... Targets: perl-html-parser-3.56-3 Total Download Size: 0.00 MB Total Installed Size: 0.09 MB Proceed with installation? [Y/n] y checking package integrity... (1/1) checking for file conflicts [#############################################] 100% (1/1) installing perl-html-parser [#############################################] 100% [~]:: maybe : skip dependencies... ?

2 1

[pacman-dev] source-highlight: command not found
by Giovanni Scafora 07 Jan '08

07 Jan '08

Hi guys, I've built latest package of the pacman git version and I noticed this warning: a2x -d manpage -f manpage --xsltproc-opts='-param man.endnotes.list.enabled 0' --xsltproc-opts='-param man.endnotes.are.numbered 0' --asciidoc-opts="-f asciidoc.conf -a pacman_version="3.1.0devel" -a pacman_date="`date +%Y-%m-%d`" -a sysconfdir=/etc" PKGBUILD.5.txt /bin/sh: source-highlight: command not found WARNING: PKGBUILD-example.txt: line 20: no output from filter: source-highlight -f docbook -s sh Note: Writing PKGBUILD.5 I guess that it is not important, but maybe you could fix it. -- Giovanni Scafora Arch Linux Trusted User (voidnull) http://www.archlinux.org linuxmania(a)gmail.com

2 3

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-736-g6f86f46
by Dan McGee 06 Jan '08

06 Jan '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 6f86f46c965d2268c533d9cedf873b922a598bb1 (commit) via 00c57ddae718e0794b2673378b070423a830ace3 (commit) via d53388fb90ee9594e07b8f00cc45436e6318c972 (commit) via e0e33c329ff249d7862a0e7ec508794faa98efd8 (commit) via a71f4c4c6a7775503b29ab856f8a5ce2801f2967 (commit) via a27d7f6071969623362785df50546cf48e8f1d2e (commit) from 1a0aaa20df29234250ecc0f9fc3f56bb8cf22ca1 (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 6f86f46c965d2268c533d9cedf873b922a598bb1 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 6 10:30:23 2008 -0600 Remove makeworld from pacman package This is an Arch-specific tool (although others could find use in it), so off to the standalone ABS package it goes. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 00c57ddae718e0794b2673378b070423a830ace3 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 6 10:26:21 2008 -0600 Remove stuff that was a little too Arch-specific from manpage footer Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d53388fb90ee9594e07b8f00cc45436e6318c972 Author: Dan McGee <dan(a)archlinux.org> Date: Sun Jan 6 10:23:49 2008 -0600 install: install prototype PKGBUILD and install to datadir Move the prototypes out of contrib/ and into the top level directory, and install them to what is usually /usr/share/pacman/ on a package install. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit e0e33c329ff249d7862a0e7ec508794faa98efd8 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 5 22:00:21 2008 -0600 Remove hardcoded DBEXT value from script Signed-off-by: Dan McGee <dan(a)archlinux.org> commit a71f4c4c6a7775503b29ab856f8a5ce2801f2967 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Jan 6 10:59:41 2008 +0100 conflict.c : fix for FS#8156, detect conflict between symlink and dir. The previous fileconflict check (package vs filesystem) skipped the conflict when the file on the filesystem was a directory or a symlink to a directory, no matter what the file in the package was. Now, the conflict will only be skipped if the file in the package is a directory (so compatible with a dir or a dir symlink on the filesystem). So in the case of 8156 (new fileconflict003 pactest for this case), instead of silently ignoring the extraction of the test symlink, pacman will now fail because of a file conflict between the test symlink in the pkg2 package and the test directory on the filesystem. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit a27d7f6071969623362785df50546cf48e8f1d2e Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sun Jan 6 10:33:17 2008 +0100 bugfix in pactest when creating a symlink at the top level. Trying to make a symlink at the top level previously made pactest fail. For example : "test -> test2/" as a file in a package. The path to the test symlink was empty in this case, but the python code still tried to chdir in "", which failed. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 4 + contrib/PKGBUILD.proto => PKGBUILD.proto | 0 contrib/Makefile.am | 2 - contrib/README | 3 - doc/footer.txt | 7 +- doc/makepkg.8.txt | 3 - lib/libalpm/conflict.c | 17 ++- pactest/tests/fileconflict003.py | 18 +++ pactest/util.py | 3 +- contrib/proto.install => proto.install | 0 scripts/.gitignore | 1 - scripts/Makefile.am | 4 +- scripts/makeworld.sh.in | 192 ------------------------------ scripts/rankmirrors.py.in | 6 +- 14 files changed, 43 insertions(+), 217 deletions(-) rename contrib/PKGBUILD.proto => PKGBUILD.proto (100%) create mode 100644 pactest/tests/fileconflict003.py rename contrib/proto.install => proto.install (100%) delete mode 100644 scripts/makeworld.sh.in hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-730-g1a0aaa2
by Dan McGee 05 Jan '08

05 Jan '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 1a0aaa20df29234250ecc0f9fc3f56bb8cf22ca1 (commit) via 5aa873edb696bbf678cbb57df43d90e23d562179 (commit) from 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a (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 1a0aaa20df29234250ecc0f9fc3f56bb8cf22ca1 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 5 17:39:38 2008 -0600 Don't stat cachedir immediately By attempting to stat the cachedir when we load the pacman config, pacman bails out if it is a non-existant directory, even if it will never be needed. This is unfortunate as it is only used for sync transactions anyway. Instead, wait until we need it in _alpm_filecache_setup to actually do anything. Reported as FS#9096. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5aa873edb696bbf678cbb57df43d90e23d562179 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 5 17:34:10 2008 -0600 sync.c: add sanity check so we don't dereference a null pointer Originally noticed in FS#9024, but was fixed in previous changes anyway. However, it doesn't hurt to still check it. Also add a pactest from Chantry Xavier for the original problem to ensure we can't reproduce it. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/handle.c | 8 +++----- lib/libalpm/sync.c | 14 ++++++++------ lib/libalpm/util.c | 3 --- pactest/tests/sync404.py | 26 ++++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 pactest/tests/sync404.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-728-g85a8b15
by Dan McGee 05 Jan '08

05 Jan '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a (commit) via 14e4366c781250092a5131b8fbbeda3aab67bd9d (commit) via 728b601f7b6df40b77bc5a4fc2dee5c1b1162fc4 (commit) from f35a5cf174ff6bc264cbd44110e9d595acc87947 (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 85a8b150edb7d1fca67f7f0abee3400bd57e7d5a Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jan 5 10:24:45 2008 +0100 conflict.c : fix for upgrade042. Thanks to the proactive backup handling, we don't need to add the moving file to the skip_add list. The backup handling will make sure nothing gets overwritten. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14e4366c781250092a5131b8fbbeda3aab67bd9d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Jan 5 16:37:55 2008 -0600 makepkg: add application/zip to the recognized types The recent upgrade of magic.mime in the file program changed the mime type output to application/zip instead of application/x-zip as it is a registered type. Unfortunately we then just skipped zip file extraction becuase of this change. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 728b601f7b6df40b77bc5a4fc2dee5c1b1162fc4 Author: Gustavo Chain <g(a)0xff.cl> Date: Sat Jan 5 15:35:30 2008 -0600 scripts: extra exit() calls in usage() function Remove the exit() calls from usage as they should be handled by the caller. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/conflict.c | 24 +++++++----------------- pactest/tests/{upgrade042.py => upgrade043.py} | 4 ++-- scripts/gensync.sh.in | 1 - scripts/makepkg.sh.in | 2 +- scripts/updatesync.sh.in | 1 - 5 files changed, 10 insertions(+), 22 deletions(-) copy pactest/tests/{upgrade042.py => upgrade043.py} (87%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] extra exit() in script
by Gustavo Chain 05 Jan '08

05 Jan '08

Hi All! I was reading the gensync script and at usage() function there is an exit() at the end of the function that invalidate exit code in the argument cheking part. Should this exit() call be removed? Bye! -- Gustavo Chaín Dumit http://0xff.cl

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-725-gf35a5cf
by Dan McGee 05 Jan '08

05 Jan '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via f35a5cf174ff6bc264cbd44110e9d595acc87947 (commit) via 7417d9d81c494a67d8ad983ccc9bbc6f58d07fca (commit) via c26039240db12794ad3f5b3d87c498b61a75e95b (commit) via 601a85082d2965174925a85942e9e8a5a0e9f735 (commit) via 04472f925a09e8760946097afc26a492af309d65 (commit) from c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a (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 f35a5cf174ff6bc264cbd44110e9d595acc87947 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 2 23:27:10 2008 -0600 doc: remove --ask option from pacman manpage Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7417d9d81c494a67d8ad983ccc9bbc6f58d07fca Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 2 20:44:09 2008 -0600 doc: add symlink for repo-remove manpage on install Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c26039240db12794ad3f5b3d87c498b61a75e95b Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jan 2 20:43:15 2008 -0600 Remove mentions of ABS from makepkg Kill off some of the $ABSROOT stuff that was still hanging around in there. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 601a85082d2965174925a85942e9e8a5a0e9f735 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Jan 5 13:09:06 2008 +0100 add.c : fix upgrade026 pactest. This was the case of the bash packaging error where a file was removed from the package but not the backup array. I just added a sanity check so that only the files from the backup array that are also in the filelist are used. I had to edit upgrade026 pactest slightly : it required the file to be copied to .pacsave instead of moved. But just moving it should be enough, as we agreed on the ML : http://www.archlinux.org/pipermail/pacman-dev/2007-December/010440.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 04472f925a09e8760946097afc26a492af309d65 Author: Matthias Gorissen <matthias(a)archlinux.de> Date: Wed Dec 19 22:28:00 2007 +0100 Update of German translation Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/.gitignore | 1 + doc/Makefile.am | 5 +- doc/makepkg.8.txt | 10 +- doc/pacman.8.txt | 6 - etc/makepkg.conf.in | 2 + lib/libalpm/add.c | 5 + lib/libalpm/po/de.po | 387 ++++++------- pactest/tests/upgrade026.py | 2 +- po/de.po | 1398 ++++++++++++++++++++++--------------------- scripts/makepkg.sh.in | 11 - 10 files changed, 908 insertions(+), 919 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [patch] de-translation
by Matthias Gorissen 05 Jan '08

05 Jan '08

There is probably a way to turn off git's default behaviour (producing one patch per commit), but I haven't figured out yet. It is a little bit complicated, but who cares as long as it works? The files below should make up for a complete de-translation. It even seems to compile this time ... Please feel free to complain on any errors which may occur, and I will correct that. Best regards, Matt

3 2

[pacman-dev] Lack of .FILELIST seems to break namcap
by Travis Willard 05 Jan '08

05 Jan '08

Hey guys, I noticed .FILELIST was recently removed from package files with the latest pacman-git update I did (from 20071209-1 to 20080102-1) and now namcap says packages generated with the new version of makepkg aren't really packages. Is this because of the loss of .FILELIST? I'd dig in, but I know zero python, and I'm hoping somebody a little more familiar with the language would be able to come up with something quicker than I would. -- Travis

3 6

[pacman-dev] [abs] Ideas about abs
by eliott 03 Jan '08

03 Jan '08

With a potential move of abs from cvsup to rsync, would it make sense to include a 'seeded' abs tree as part of the abs package (a point in time snapshot of the abs tree) so that people can get off to a bit of a start, as well as spread 'some' of the initial bandwidth to the mirrors? Something like the abs package including a snapshot in /usr/share/abs/base-tree.tar.gz or something equally brain dead.

2 2

[pacman-dev] [PATCH] Notify of package replacements when using noconfirm
by Allan McRae 03 Jan '08

03 Jan '08

Hi, This is a small patch that prints a message about package replacements when upgrading with the --noconfirm flag. This adds a new string for translation. Do I need to also add something the translation file or is that automatically handled? Allan

3 2

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-720-gc18191b
by Dan McGee 03 Jan '08

03 Jan '08

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a (commit) via 4abd710ec993bf5766fdbf2f1cf240a8d6e7d17f (commit) via 860465b34ba86bdced01ec494cffb94f95301445 (commit) via 553ce8323c23fe3259e45b2708184533158501bd (commit) via d18686a5637c50a8229a0a280f81a1eb9ec34ed0 (commit) via ac0605b9c27bf206c99bd73302efeff3ce79797e (commit) via dffa0654f2eae1c427a74c647d22f0bbd201ccf7 (commit) via fbd88a8212e794899e75ecf44024777c5a58deb2 (commit) via 01930400a5f40f4ea5e9cafeff00afff515d0a2c (commit) via b3c6bdda38f7e370e1f80f02a61f1d3f08c1b57d (commit) from 26c05b1c8c6fe639cd4eea5decac694c86cc7c00 (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 c18191ba5b54439b8e7f64ef8aff0bb37f4b0a8a Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 1 19:59:27 2008 -0600 Small code cleanups with indents/spaces Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 4abd710ec993bf5766fdbf2f1cf240a8d6e7d17f Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 1 19:57:02 2008 -0600 Remove gettext calls from debug-level messages These used FUNCTION output level and not DEBUG, so I didn't catch them way back when I removed those gettext calls. Remove them now (which exposed a nice little memory access error elsewhere in the code). This should have a slight speedup effect on the code too as we no longer have to make the gettext call even when these messages aren't printed. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 860465b34ba86bdced01ec494cffb94f95301445 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 1 19:56:32 2008 -0600 Add some more regular contributors to the AUTHORS file Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 553ce8323c23fe3259e45b2708184533158501bd Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 1 19:14:34 2008 -0600 Fix another usage of pkg_new in _alpm_sync_addtarget Use _alpm_pkg_dup instead. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d18686a5637c50a8229a0a280f81a1eb9ec34ed0 Author: Dan McGee <dan(a)archlinux.org> Date: Tue Jan 1 19:12:09 2008 -0600 Switch pkg_new -> pkg_dup in find_replacements Ugh, it was a pain to figure out why the Total Removed Size was showing up wrong in the output of removed packages, but this was why- we used a stupid _alpm_pkg_new call instead of just duping the package. Fix this. In the long run, we really need to figure out better ways to not duplicate all this package information. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ac0605b9c27bf206c99bd73302efeff3ce79797e Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Tue Jan 1 17:25:12 2008 +0100 new upgade042 pactest + bugfix in chk_filedifference. This adds a pactest for the relocation of a config file between two packages (case of etc/profile moving from bash to filesystem). While running this pactest, I found out that chk_filedifference didn't work correctly with an empty list as second argument. So that's fixed now. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit dffa0654f2eae1c427a74c647d22f0bbd201ccf7 Author: Karolina Lindqvist <karolina.lindqvist(a)kramnet.se> Date: Sat Dec 29 12:42:45 2007 -0600 Fix case where pacman asks for confirmation when it should not There is another case where pacman-git asks for confirmation, when it should not. It is when removing packages. If running with makeworld --noconfirm --rmdeps the question will come to the log file, and never appear on the console, so you can wait forever wondering what is happening. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fbd88a8212e794899e75ecf44024777c5a58deb2 Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 29 11:24:57 2007 -0600 Remove .FILELIST generation from makepkg (and elsewhere) This is something pacman can do on its own straight from the archive, and we will reduce the chance of problems occurring becuase of inproper FILELIST generation as we have had in the past with special characters in filenames. Once we remove it from makepkg. we can remove any usage of it from all of our other tools, including pacman, pactest, and contrib/ utilities. Note that removing it from pacman uncovered a few other bugs anyway, so this was probably a good move. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 01930400a5f40f4ea5e9cafeff00afff515d0a2c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 29 18:06:40 2007 +0100 add a new upgrade026 pactest for backup handling. This is the bash case when the /etc/profile file was removed by error from the package, but stayed in the backup array. Ref: http://www.archlinux.org/pipermail/arch-dev-public/2007-December/003556.html Also fixed a little typo in add.c, but it's disabled code. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit b3c6bdda38f7e370e1f80f02a61f1d3f08c1b57d Author: Dan McGee <dan(a)archlinux.org> Date: Sat Dec 29 00:24:15 2007 -0600 doc: rename manlink macro to linkman Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock Asciidoc configuration: @@ -149,7 +153,10 @@ # Inline macros. # Backslash prefix required for escape processing. # (?s) re flag for line spanning. -(?su)[\\]?(?P<name>\w(\w|-)*?):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + +# Explicit so they can be nested. +(?su)[\\]?(?P<name>(http|https|ftp|file|mailto|callto|image|link)):(?P<target>\S*?)(\[(?P<attrlist>.*?)\])= + # Anchor: [[[id]]]. Bibliographic anchor. (?su)[\\]?\[\[\[(?P<attrlist>[\w][\w-]*?)\]\]\]=anchor3 # Anchor: [[id,xreflabel]] This default regex now matches explicit values, and unfortunately in this case manlink was being matched by just 'link', causing the wrong inline macro template to be applied. By renaming the macro, we can avoid being matched by the wrong regex. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: AUTHORS | 2 + contrib/re-pacman | 8 +-- doc/Makefile.am | 2 +- doc/PKGBUILD.5.txt | 10 ++-- doc/asciidoc.conf | 14 +++--- doc/libalpm.3.txt | 4 +- doc/makepkg.8.txt | 18 +++--- doc/makepkg.conf.5.txt | 6 +- doc/pacman.8.txt | 10 ++-- doc/pacman.conf.5.txt | 6 +- doc/repo-add.8.txt | 4 +- lib/libalpm/add.c | 4 +- lib/libalpm/be_files.c | 3 +- lib/libalpm/cache.c | 2 +- lib/libalpm/conflict.c | 11 +++- lib/libalpm/package.c | 70 ++++++++---------------- lib/libalpm/sync.c | 5 +- pactest/pmpkg.py | 20 +------ pactest/tests/{upgrade025.py => upgrade026.py} | 4 +- pactest/tests/upgrade042.py | 28 ++++++++++ scripts/makepkg.sh.in | 11 +---- src/pacman/remove.c | 3 +- 22 files changed, 113 insertions(+), 132 deletions(-) copy pactest/tests/{upgrade025.py => upgrade026.py} (74%) create mode 100644 pactest/tests/upgrade042.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] new upgade042 pactest + bufix in chk_filedifference.
by Chantry Xavier 02 Jan '08

02 Jan '08

This adds a pactest for the relocation of a config file between two packages (case of etc/profile moving from bash to filesystem). While running this pactest, I found out that chk_filedifference didn't work correctly whith an empty list as second argument. So that's fixed now. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010610.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/conflict.c | 4 ++++ pactest/tests/upgrade042.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) create mode 100644 pactest/tests/upgrade042.py diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 91f4360..c1aac4d 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -251,6 +251,10 @@ static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB) alpm_list_t *ret = NULL; alpm_list_t *pA = filesA, *pB = filesB; + if(pB == NULL) { + return(pA); + } + while(pA && pB) { const char *strA = pA->data; const char *strB = pB->data; diff --git a/pactest/tests/upgrade042.py b/pactest/tests/upgrade042.py new file mode 100644 index 0000000..d6140d4 --- /dev/null +++ b/pactest/tests/upgrade042.py @@ -0,0 +1,28 @@ +self.description = "Backup file relocation" + +lp1 = pmpkg("bash") +lp1.files = ["etc/profile*"] +lp1.backup = ["etc/profile"] +self.addpkg2db("local", lp1) + +p1 = pmpkg("bash", "1.0-2") +self.addpkg(p1) + +lp2 = pmpkg("filesystem") +self.addpkg2db("local", lp2) + +p2 = pmpkg("filesystem", "1.0-2") +p2.files = ["etc/profile**"] +p2.backup = ["etc/profile"] +p2.depends = [ "bash" ] +self.addpkg(p2) + +self.args = "-U %s" % " ".join([p.filename() for p in p1, p2]) + +self.filesystem = ["etc/profile"] + +self.addrule("PKG_VERSION=bash|1.0-2") +self.addrule("PKG_VERSION=filesystem|1.0-2") +self.addrule("!FILE_PACSAVE=etc/profile") +self.addrule("FILE_PACNEW=etc/profile") +self.addrule("FILE_EXIST=etc/profile") -- 1.5.3.7

4 4

[pacman-dev] Bug in pactest suite
by Nagy Gabor 29 Dec '07

29 Dec '07

Hi! I noticed, that with fileconflict*.py the .FILELISTs of generated packages isn't generated correctly: the symlinks are missing. So we can ignore the results of these pactests now. Bye

4 6

[pacman-dev] another case when pacman is asking for confirmation when it should not
by Karolina Lindqvist 29 Dec '07

29 Dec '07

There is another case where pacman-git asks for confirmation, when it should not. It is when removing packages. If running with makeworld --noconfirm --rmdeps the question will come to the log file, and never appear on the console, so you can wait forever wondering what is happening. *** src/pacman/remove.c~ Tue Dec 11 05:06:48 2007 --- src/pacman/remove.c Sun Dec 16 20:34:12 2007 *************** *** 155,161 **** list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ ! if(yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { remove_cleanup(); FREELIST(finaltargs); return(1); --- 155,161 ---- list_display(_("Targets:"), lst); FREELIST(lst); /* get confirmation */ ! if(!config->noconfirm && yesno(_("\nDo you want to remove these packages? [Y/n] ")) == 0) { remove_cleanup(); FREELIST(finaltargs); return(1);

3 2

[pacman-dev] alpm_pkg_checkmd5sum
by Allan McRae 29 Dec '07

29 Dec '07

Hi, I was looking at FS#7155 (http://bugs.archlinux.org/task/7155) which I believe to be fixed now but during then I notice some left overs from what appears to be a rewrite of the md5sum checking. In the bug report, it was asking for more information than "error: failed to commit transaction (invalid or corrupted package)". Trying to look at this I noticed that the "invalid of corrupted package" part can only generated by alpm_pkg_checkmd5sum() which is not used anywhere. The "error: failed to commit transaction" part is generated by sync_trans() if alpm_trans_commit() fails which in this case can be followed through to test_md5sum() failing. So it looks like md5sum checking was overhauled at some stage. So my question is: Is alpm_pkg_checkmd5sum() a leftover of the past and need removing? Cheers, Allan

4 3

[pacman-dev] Asciidoc manpages
by Dan McGee 29 Dec '07

29 Dec '07

Does anyone on the list know a lot about Asciidoc? Specifically, I noticed that our manpage generation has gotten a bit weird. Notice that every manpage generated in the pacman-git release (or in your own working tree when using --enable-asciidoc) has: * a weird Notes section at the bottom * a broken "See Also" section (looks like the macro is busted or something) In addition, the PKGBUILD example nclude in PKGBUILD.5 does not look so hot. Does anyone (Andrew, are you still around?) want to look into this and see what they can come up with to fix it? I swear we had it working for a while, so this may be related to a docbook-xsl upgrade. If you do investigate, be sure whatever changes you make keep both the HTML and the manpage format looking OK. -Dan

3 5

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.0.6-710-g26c05b1
by Dan McGee 29 Dec '07

29 Dec '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 26c05b1c8c6fe639cd4eea5decac694c86cc7c00 (commit) via fdab7207e2bc96ca0f22397a0073f5d1a9c2a2c7 (commit) via c913c53322a7bd4a006a905df4087092a0630ab4 (commit) via 73aa6b610e22377a40c567156b610319ffb9e024 (commit) via 630541a72e2ca041d2fb4401b374670134b12c3d (commit) via 457692b928617cf15d012477af49ced8a3060e9c (commit) via c84feb92dbbc6d5f60cb58db53cfc372acf0516c (commit) via 14d6832ef24aeda7fe77cf4285538baa6e21670c (commit) via cca4ec647e6b5e1959206348360cc7412a5e8ed2 (commit) via d8a10a8e72a4a4c776f52ccdb66c0914b274ea4f (commit) from 9addd88a7d12c8c8445ec226e2837afe01e660b7 (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 26c05b1c8c6fe639cd4eea5decac694c86cc7c00 Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 21 23:47:18 2007 -0600 Ensure that manpages are always distributed and installed Commit 012f7939784358b02726c169543aa99436439335 was a bit misguided in its thinking, and resulted in a package built without asciidoc enabled not installing the manpages to the system on a 'make install' operation. Fix this behavior by making manpages required in a normal build, and in order to disable their existence, the '--disable-doc' option must be used. Hopefully this solves manpage issues for both developers and package builders while allowing as much flexibility as possible. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fdab7207e2bc96ca0f22397a0073f5d1a9c2a2c7 Author: Giovanni Scafora <linuxmania(a)gmail.com> Date: Sat Dec 22 19:59:34 2007 +0100 Updated Italian translation Signed-off-by: Giovanni Scafora <linuxmania(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c913c53322a7bd4a006a905df4087092a0630ab4 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 20:54:01 2007 +0100 libalpm/add.c: disable buggy backup handling code that didn't do anything. As I mentioned earlier on the ML : http://www.archlinux.org/pipermail/pacman-dev/2007-December/010416.html the first part of commit 843d368ef6 had no effect because of a bug. So I fixed the bug, but since this would change backup handling behavior, and possibly require other bigger changes to work right, I decided to just disable that part temporarily, and left a TODO in the code. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 73aa6b610e22377a40c567156b610319ffb9e024 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 20:32:57 2007 +0100 fix two broken pactests because of date localization. query002 and sync1100 had PACMAN_OUTPUT rules that looked at the build/install date (localized). Instead of looking at the month name, it will now check the year, which should be safer. I also had to add another pactest (query005) for keeping the same coverage. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 630541a72e2ca041d2fb4401b374670134b12c3d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 18:51:49 2007 +0100 french translation : one broken message caused a segfault. pacman segfaulted on sync012 pactest because of one broken translation. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 457692b928617cf15d012477af49ced8a3060e9c Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Sat Dec 22 17:47:19 2007 +0100 libalpm/remove.c : switch back to lstat usage. commit b55abdce7a changed every instance of lstat to alpm_stat to remove an eventual trailing /, but in remove.c, this is not wanted. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010451.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit c84feb92dbbc6d5f60cb58db53cfc372acf0516c Author: K. Piche <kevin(a)archlinux.org> Date: Sat Dec 22 18:58:49 2007 -0500 Makepkg missing check for empty pkgname I thought it was wierd that makepkg didn't do a sanity check for the $pkgname. This makes for a simple first try at a GIT patch. Signed-off-by: K. Piche <kevin(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 14d6832ef24aeda7fe77cf4285538baa6e21670c Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sun Dec 23 01:57:43 2007 +1000 Allow NULL parameter in alpm_trans_commit Fixes FS#7380: alpm crashes on passing NULL to alpm_trans_commit in a sync operation. Adds check that data parameter is not NULL in several functions. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: fix whitespace] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit cca4ec647e6b5e1959206348360cc7412a5e8ed2 Author: Allan McRae <mcrae_allan(a)hotmail.com> Date: Sat Dec 22 21:28:08 2007 +1000 Add remove counterparts to alpm_option_add_* functions Fixes FS#7428. Added functions to remove cachedir, noupgrade, noextract, ignorepkg, holdpkg and ignoregrp. Signed-off-by: Allan McRae <mcrae_allan(a)hotmail.com> [Dan: fix whitespace] Signed-off-by: Dan McGee <dan(a)archlinux.org> commit d8a10a8e72a4a4c776f52ccdb66c0914b274ea4f Author: Dan McGee <dan(a)archlinux.org> Date: Fri Dec 28 18:43:49 2007 -0600 Update path for Belnet mirror Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 5 +- configure.ac | 17 ++ doc/Makefile.am | 17 +- etc/pacman.d/mirrorlist.in | 2 +- lib/libalpm/add.c | 25 ++- lib/libalpm/alpm.h | 6 + lib/libalpm/handle.c | 83 ++++++ lib/libalpm/po/fr.po | 4 +- lib/libalpm/remove.c | 6 +- lib/libalpm/sync.c | 46 ++-- lib/libalpm/trans.c | 4 +- pactest/tests/query002.py | 6 +- pactest/tests/{query002.py => query005.py} | 8 +- pactest/tests/sync1100.py | 2 +- po/it.po | 419 ++++++++++++++-------------- scripts/makepkg.sh.in | 4 + 16 files changed, 391 insertions(+), 263 deletions(-) copy pactest/tests/{query002.py => query005.py} (69%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] Makepkg missing check for empty pkgname
by K. Piche 29 Dec '07

29 Dec '07

I thought it was wierd that makepkg didn't do a sanity check for the $pkgname. This makes for a simple first try at a GIT patch. Can outgoing SMTP be setup on patch generation? Seems silly to import a text file in evolution everytime... Signed-off-by: K. Piche <kevin(a)archlinux.org> --- scripts/makepkg.sh.in | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ef7bae5..f37772a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1288,6 +1288,10 @@ fi source "$BUILDSCRIPT" # check for no-no's in the build script +if [ -z "$pkgname" ]; then + error "$(gettext "%s is not allowed to be empty.")" "pkgname" + exit 1 +fi if [ -z "$pkgver" ]; then error "$(gettext "%s is not allowed to be empty.")" "pkgver" exit 1 -- 1.5.3.7 -- K. Piche <kpiche(a)rogers.com>

2 1

Re: [pacman-dev] December 74% OFF
by Doctor Carmen Byrne 26 Dec '07

26 Dec '07

1 0

[pacman-dev] [PATCH] Add check for NULL data parameter in sync commit
by Allan McRae 24 Dec '07

24 Dec '07

3 5

[pacman-dev] [PATCH] Add remove counterparts to alpm_option_add_* functions
by Allan McRae 24 Dec '07

24 Dec '07

5 17

[pacman-dev] [PATCH] libalpm/remove.c : switch back to lstat usage.
by Chantry Xavier 22 Dec '07

22 Dec '07

commit b55abdce7a changed every instance of lstat to alpm_stat to remove an eventual trailing /, but in remove.c, this is not wanted. Ref: http://www.archlinux.org/pipermail/pacman-dev/2007-December/010451.html Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> --- lib/libalpm/remove.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0e8b57a..125719a 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -203,7 +203,7 @@ static void unlink_file(pmpkg_t *info, alpm_list_t *lp, pmtrans_t *trans) } } - if(_alpm_lstat(file, &buf)) { + if(lstat(file, &buf)) { _alpm_log(PM_LOG_DEBUG, "file %s does not exist\n", file); return; } -- 1.5.3.7

2 2