July 2007 - Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-300-g1c9f30b
by Dan McGee 13 Jul '07

13 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via 1c9f30b9fab998e2d89dd307a90122618d746cb6 (commit) via 8d62835ba18a7fb662c2f3a23b86a16fe1386388 (commit) via 5ed501565ef8caf4fe2043066750ed7564a2c52d (commit) via 723478560179bc541e89627c43b1cea512fab2a1 (commit) from c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec (commit) - Log ----------------------------------------------------------------- commit 1c9f30b9fab998e2d89dd307a90122618d746cb6 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Jul 13 15:30:37 2007 +0200 libalpm/deps.c : fix for remove044 pactest. Patch from Nagy that makes removedeps use alpm_depcmp. I also renamed removedeps to recursedeps, as it can have a more general usage, and added an include_explicit argument, so we can control if packages explictly installed are added or not. Note: Small changes made by me (Dan) as well- mostly some English grammar correction and a few other cleanups. Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8d62835ba18a7fb662c2f3a23b86a16fe1386388 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Jul 13 10:41:40 2007 +0200 Remove conflict message for non-existent files (reworked) Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 5ed501565ef8caf4fe2043066750ed7564a2c52d Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Fri Jul 13 11:06:53 2007 +0200 remove sync022 and sync023 pactest. Currently the replaces flag is only used for forcing the replacement of package (eg because of a renaming) on sysupgrade operation. If the replaces flag should also be used for resolving conflicts, then it should be discussed and specified correctly first. References: http://bugs.archlinux.org/task/7415#comment17207 http://www.archlinux.org/pipermail/pacman-dev/2007-June/008553.html commit which introduced the replace flag : 4fcec8f03ff790bfb23b826eee169bc9c0b00142 Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> commit 723478560179bc541e89627c43b1cea512fab2a1 Author: Chantry Xavier <shiningxc(a)gmail.com> Date: Thu Jul 12 13:49:23 2007 +0200 libalpm/remove.c : Rsd combination. Currently the d (nodeps) option skips the s (recursive) part, rendering the Rsd combination totally useless. This patch makes a recursive removal still possible using the nodeps option, as Romashka asked there : http://bugs.archlinux.org/task/6057#comment17784 Signed-off-by: Chantry Xavier <shiningxc(a)gmail.com> ----------------------------------------------------------------------- Diffstat: lib/libalpm/conflict.c | 12 +++-- lib/libalpm/deps.c | 104 ++++++++++++++++++++++------------------------ lib/libalpm/deps.h | 2 +- lib/libalpm/remove.c | 32 ++++++++------ pactest/tests/sync022.py | 22 ---------- pactest/tests/sync023.py | 22 ---------- 6 files changed, 76 insertions(+), 118 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec \ 1c9f30b9fab998e2d89dd307a90122618d746cb6

1 0

[pacman-dev] FS7228: Update {PKGBUILD,install}.proto
by Andrew Fyfe 13 Jul '07

13 Jul '07

Attached is a patch to update {PKGBUILD,install}.proto - Add group and options field - Quote $startdir - Add vim modeline - Add check to see if function exists in install.proto before trying to call it, avoids the annoying bash error if the function is missing. Andrew --- PKGBUILD.proto.orig 2007-03-02 20:42:07.000000000 +0000 +++ PKGBUILD.proto 2007-06-05 14:11:56.000000000 +0100 @@ -11,6 +11,7 @@ arch=() url="" license=('GPL') +groups=() depends=() makedepends=() provides=() @@ -18,13 +19,17 @@ replaces=() backup=() install= +options=() source=($pkgname-$pkgver.tar.gz) noextract=() -md5sums=(generate with makepkg -g) +md5sums=() # generate with 'makepkg -g' build() { - cd $startdir/src/$pkgname-$pkgver + cd "$startdir"/src/$pkgname-$pkgver + ./configure --prefix=/usr make || return 1 - make DESTDIR=$startdir/pkg install + make DESTDIR="$startdir"/pkg install } + +# vim:set ts=2 sw=2 et: --- install.proto.orig 2004-11-03 01:14:37.000000000 +0000 +++ install.proto 2007-06-05 14:11:47.000000000 +0100 @@ -35,4 +35,6 @@ op=$1 shift -$op $* +[ "$(type -t "$op")" = "function" ] && "$op" "$@" + +# vim:set ts=2 sw=2 et:

9 17

[pacman-dev] [PATCH] Cleanup code handling a sysupgrade of pacman itself
by Dan McGee 13 Jul '07

13 Jul '07

Anyone have a problem with this change (Aaron)? -Dan --- The old code attempted to upgrade pacman by itself and automate the process by creating a new transaction and a bunch of other complicated stuff. We should just leave such actions to the user to decide instead of trying to do it for them, and it caused problems when pulling in dependencies. For now, simply request that the user run a 'pacman -S pacman' operation. If they want, they can also answer 'N' at the prompt and the upgrade proceeds as normal. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- src/pacman/sync.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 8982b95..25563e3 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -544,24 +544,7 @@ int pacman_sync(alpm_list_t *targets) ":: operation. If you wish to continue the operation and\n" ":: not upgrade pacman seperately, answer no.\n")); if(yesno(_(":: Cancel current operation? [Y/n] "))) { - if(alpm_trans_release() == -1) { - fprintf(stderr, _("error: failed to release transaction (%s)\n"), - alpm_strerror(pm_errno)); - retval = 1; - goto cleanup; - } - if(alpm_trans_init(PM_TRANS_TYPE_SYNC, config->flags, - cb_trans_evt, cb_trans_conv, cb_trans_progress) == -1) { - fprintf(stderr, _("error: failed to init transaction (%s)\n"), - alpm_strerror(pm_errno)); - return(1); - } - if(alpm_trans_addtarget("pacman") == -1) { - fprintf(stderr, _("error: pacman: %s\n"), alpm_strerror(pm_errno)); - retval = 1; - goto cleanup; - } - break; + goto cleanup; } } } -- 1.5.2.1

3 3

[pacman-dev] Remove CHOST from makepkg.conf
by Andrew Fyfe 13 Jul '07

13 Jul '07

Are there any objections to removing CHOST from makepkg.conf? It's never seen by package Makefiles as it's not exported, and as a general rule it's a BAD idea to mess with CHOST. If there's no objections I'll do up a patch. Andrew

4 6

[pacman-dev] A prosition for an enhancement - addition of category info to .PKGINFO
by Bozhidar Batsov 13 Jul '07

13 Jul '07

Wouldn't it be wise if the category information was added to each package's .PKGINFO file? That way clients could search for or in package categories and the capabilities of GUI front-ends could enhanced a great deal. As a matter of fact why was this possibility ever considered and if so why was the idea dropped?

7 11

[pacman-dev] [GIT] pacman branch, master now at v3.0.0-296-gc0a7d9d
by Dan McGee 13 Jul '07

13 Jul '07

Hello, This is an automated email from the git hooks/update script, it was generated because a ref change was pushed to the repository. Updating branch, master, via c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec (commit) via d402583c43a9d409531824573a6021a1965d8ee6 (commit) via fd3a1a92c8ffe5230e40a027838442752a843da9 (commit) via 20f73d6299c08fa79c2c8edd3d1955e208e701cb (commit) via 653fb8fe036363dfb550785c45adcf26f6fcbfbc (commit) via 147a32b32de4ebcbb51c963f2573d9218d9a2eb9 (commit) from cb164c3130f15b22dbf16991c28ba609cd2f79de (commit) - Log ----------------------------------------------------------------- commit c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu Jul 12 20:45:02 2007 +0100 Some doxygen comments. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit d402583c43a9d409531824573a6021a1965d8ee6 Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 16:00:35 2007 -0400 Remove some more conditional include stuff Signed-off-by: Dan McGee <dan(a)archlinux.org> commit fd3a1a92c8ffe5230e40a027838442752a843da9 Author: Andrew Fyfe <andrew(a)neptune-one.net> Date: Thu Jul 12 20:12:08 2007 +0100 Fix previous makepkg patch, and some pacman output. makepkg: We still need the source files in $srcdir because PKGBUILDS need access to noextract() files and other file not handled by by extract_source(). (eg config files) query.c: Fix some output formating. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> commit 20f73d6299c08fa79c2c8edd3d1955e208e701cb Author: Dan McGee <dan(a)archlinux.org> Date: Thu Jul 12 15:20:43 2007 -0400 Remove versioncmp.{c,h}, clean up selective #ifdefs Remove versioncmp.c by moving all functions to locations that make sense. Move replacement functions (for building without glibc) into util.c where they belong, and do proper checks for them instead of using __sun__, etc. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 653fb8fe036363dfb550785c45adcf26f6fcbfbc Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 11 23:36:13 2007 -0400 Remove 'buildtype' from libalpm and pacman Remove unused buildtype field from pmpkg_t struct and anything associated with it, as it is unused at the moment. If we need to readd it, it is an easy revert of this commit. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 147a32b32de4ebcbb51c963f2573d9218d9a2eb9 Author: Dan McGee <dan(a)archlinux.org> Date: Wed Jul 11 10:59:27 2007 -0400 Add {PKGBUILD,install}.proto to contrib/ directory Also update README and Makefile.am in the contrib/ directory. Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Diffstat: configure.ac | 2 +- contrib/Makefile.am | 6 +- contrib/PKGBUILD.proto | 35 +++++ contrib/README | 7 + contrib/install.proto | 40 ++++++ contrib/vimproject | 2 - lib/libalpm/Makefile.am | 3 +- lib/libalpm/add.c | 1 - lib/libalpm/be_files.c | 12 -- lib/libalpm/deps.c | 48 +++++++- lib/libalpm/package.c | 112 ++++++++++++++--- lib/libalpm/package.h | 4 +- lib/libalpm/po/POTFILES.in | 1 - lib/libalpm/remove.c | 1 - lib/libalpm/sync.c | 1 - lib/libalpm/trans.c | 8 +- lib/libalpm/util.c | 131 +++++++++++++++---- lib/libalpm/util.h | 8 +- lib/libalpm/versioncmp.c | 294 -------------------------------------------- lib/libalpm/versioncmp.h | 33 ----- scripts/makepkg.sh.in | 2 + src/pacman/package.c | 4 +- src/pacman/query.c | 6 +- 23 files changed, 347 insertions(+), 414 deletions(-) hooks/update --- Git Source Code Management System hooks/update refs/heads/master \ cb164c3130f15b22dbf16991c28ba609cd2f79de \ c0a7d9d82d03d9831f53dbb30357ddb9f10e29ec

1 0

[pacman-dev] [PATCH] Some doxygen comments.
by Andrew Fyfe 12 Jul '07

12 Jul '07

Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- lib/libalpm/deps.c | 2 +- lib/libalpm/trans.c | 5 +++++ src/pacman/deptest.c | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index 591e5a8..3560fdd 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -222,7 +222,7 @@ alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode) * @param db pointer to the local package database * @param op transaction type * @param packages an alpm_list_t* of packages to be checked - * @return an alpm_list_t* of missing_t pointers. + * @return an alpm_list_t* of pmpkg_t* of missing_t pointers. */ alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, alpm_list_t *packages) diff --git a/lib/libalpm/trans.c b/lib/libalpm/trans.c index 2078a5d..75f2a1d 100644 --- a/lib/libalpm/trans.c +++ b/lib/libalpm/trans.c @@ -298,6 +298,11 @@ int _alpm_trans_sysupgrade(pmtrans_t *trans) return(_alpm_sync_sysupgrade(trans, handle->db_local, handle->dbs_sync)); } +/** Add a target to the transaction. + * @param trans the current transaction + * @param target the name of the target to add + * @return 0 on success, -1 on error (pm_errno is set accordingly) + */ int _alpm_trans_addtarget(pmtrans_t *trans, char *target) { ALPM_LOG_FUNC; diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c index 0f149b2..3b6b7ac 100644 --- a/src/pacman/deptest.c +++ b/src/pacman/deptest.c @@ -35,7 +35,9 @@ extern config_t *config; -/* TODO: This should use _alpm_checkdeps() */ +/** + * @todo This should use _alpm_checkdeps() + */ int pacman_deptest(alpm_list_t *targets) { int retval = 0; -- 1.5.2.3

2 4

[pacman-dev] Summary of pacman development
by Dan McGee 12 Jul '07

12 Jul '07

This is a quick summary for all of us on the list to see if we are on the same page. I just wanted to get out what we've gotten accomplished in the last month or so, and where we need to go from here to maybe get a pacman 3.1 release pushed out the door. We have had some 272 commits since the version 3.0 tag, so we have gotten some work done, but I don't think any of us are very clear on where the 3.1 release should be. Things we've done: * A lot of makepkg cleanup courtesy of Andrew Fyfe. (http://projects.archlinux.org/git/?p=pacman.git&a=search&st=commit&s=makepkg) * Brought xdelta support into official makepkg- we still need to decide on a strategy for using this if we want to. * Switched to bsdtar usage in makepkg- we no longer depend on the multitude of unzip programs as bsdtar can handle most of them now. * Added several pactests to isolate small issues, most from Nagy Gabor. * Implemented topological support for dependency sorting, courtesy of Nagy Gabor. * Several other small fixes all over the place, and a good amount of code refactoring. * Gettext will now work for our shell scripts- we now have a whole lot more strings that need translating. :) * Bugs closed: http://bugs.archlinux.org/index.php?events%5B%5D=2&event_number=20&project=… Things to do: * Pacman and directory symlinks: http://bugs.archlinux.org/task/7484 http://archlinux.org/pipermail/pacman-dev/2007-June/008638.html This is quite the fun little bug. A lot of it deals with our transition both to libarchive, and then to the 2.X branch of libarchive. Andrew has a proposed patch for this problem * Remove CHOST from makepkg.conf? ( http://archlinux.org/pipermail/pacman-dev/2007-July/008662.html) * Fix some bugs related to dependencies: FS 7495, 7416 * FS 7406- NREP umask issue. We should ensure that libalpm and pacman are setting sane umasks for their operations, and we don't get things that have the wrong umask such as db entries. * FS 7193- pacman -D is missing. We should reimplement this as a suboperation of -U such as --asdep or something. It shouldn't be too hard- look at the commit we removed this operation in and revert the parts of it that are necessary, and just use different command line flags. * FS 7137/7133- looks like DB issues * FS 7271- makepkg caching netfiles- should be a super quick fix for someone like Andrew (hint, hint) :) Just look at Roman's last comment * Asciidoc- this is coming along great, Andrew and I have a separate branch for now we are maintaining it in. This should make writing man pages much more pain-free. A few formatting issues probably need working out, but this will also allow us to make much prettier online HTML-formatted documentation. * Current pactests known to fail: requiredby004, sync022, upgrade051. If anyone else on the ML has things to add to this list, please get it out here. Eventually we can lay out a timetable for pacman 3.1 release and start doing some serious testing and regression testing. -Dan

5 12

[pacman-dev] [PATCH] Fix previous makepkg patch, and some pacman output.
by Andrew Fyfe 12 Jul '07

12 Jul '07

makepkg: We still need the source files in $srcdir because PKGBUILDS need access to noextract() files and other file not handled by by extract_source(). (eg config files) query.c: Fix some output formating. Signed-off-by: Andrew Fyfe <andrew(a)neptune-one.net> --- scripts/makepkg.sh.in | 2 ++ src/pacman/query.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 137d58e..d340252 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -447,9 +447,11 @@ download_sources() { local file=$(strip_url "$netfile") if [ -f "$startdir/$file" ]; then msg2 "$(gettext "Found %s in build dir")" "$file" + cp -s --remove-destination "$startdir/$file" "$srcdir/" continue elif [ -f "$SRCDEST/$file" ]; then msg2 "$(gettext "Using cached copy of %s")" "$file" + cp -s --remove-destination "$SRCDEST/$file" "$srcdir/" continue fi diff --git a/src/pacman/query.c b/src/pacman/query.c index cfd53df..f6c6b5d 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -251,7 +251,7 @@ static int query_test(void) int ret = 0; alpm_list_t *testlist; - printf(_("Checking database for consistency...")); + printf(_("Checking database for consistency... ")); testlist = alpm_db_test(db_local); if(testlist == NULL) { printf(_("check complete.\n")); @@ -271,7 +271,7 @@ static int query_test(void) static int query_upgrades(void) { - printf(_("Checking for package upgrades...")); + printf(_("Checking for package upgrades... \n")); alpm_list_t *syncpkgs; if((syncpkgs = alpm_db_get_upgrades()) != NULL) { @@ -279,7 +279,7 @@ static int query_upgrades(void) return(0); } - printf(_("no upgrades found")); + printf(_("no upgrades found.\n")); return(1); } -- 1.5.2.3

2 1

[pacman-dev] cosmetics: move alpm_depcmp to deps.c
by ngaba＠petra.hos.u-szeged.hu 12 Jul '07

12 Jul '07

Hi! I told everything in the subject, I think alpm_depcmp belongs to deps.c Bye, ngaba ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program.

3 2