- Pacman-dev - lists.archlinux.org

[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