January 2008 - Pacman-dev - lists.archlinux.org

[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