- Pacman-dev - lists.archlinux.org

[pacman-dev] [RFC] New attempt at a better interface for adding/removing target
by Xavier Chantry 19 Oct '10

19 Oct '10

See http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=eeab3… ================================== alpm: deprecate old interface Old interface is marked as deprecated: int alpm_sync_target(char *target); int alpm_sync_dbtarget(char *db, char *target); int alpm_add_target(char *target); int alpm_remove_target(char *target); New recommended interface: int alpm_add_pkg(pmpkg_t *pkg); int alpm_remove_pkg(pmpkg_t *pkg); ================================== Having interfaces dealing directly with pmpkg_t is more powerful and more accurate. Also see http://mailman.archlinux.org/pipermail/pacman-dev/2009-June/008847.html However it's probably also less safe for bad frontends trying to do stupid things and trying to pass invalid or outdated pmpkg. I am not sure what the consequences could be, it might need some more thinking and a few sanity checks. I unified sync_pkg and add_pkg, however there was a slight behavior difference between them, which should be fixed. http://code.toofishes.net/cgit/xavier/pacman.git/commit/?h=working&id=fca9e… ================================== pacman/upgrade: switch to new interface Note that there is a behavior change here : if the same package name appeared several times in the target list, the alpm_add_target interface chooses the new package, while alpm_add_pkg returns PKG_DUP. I don't see why we cannot unify the behavior of -S and -U, and just choose one behavior that applies to both. Otherwise, it's always possible to handle these different behaviors in the frontend, it just requires more work. ================================== I just picked the two commits I found most relevant and for which I saw some possible concerns, but there are ~10 commits related to this interface rework on my branch.

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v3.4.1-11-g30734c9
by dan＠archlinux.org 18 Oct '10

18 Oct '10

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, maint has been updated via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) from 3a06a9fa9fafe705bfb79c23dd75ca226b22026c (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.4.1-139-g0f3957a
by dan＠archlinux.org 18 Oct '10

18 Oct '10

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 0f3957ab48f34df8e151ec026dfac0d9d2df5aec (commit) via ce96f39ac9313a3583f346adfd2c709a658fae58 (commit) via 8f2eaa51c2705a066da3d18af287ec6e0d80c032 (commit) via 9d0b33fd3327ae6d2b15f50870c0885a2068d492 (commit) via 30734c9a4a63a1bfac0921b944e84f24dc87d76f (commit) via a2d7f6f2061fdf0ff225eaceda5c78ee520495ff (commit) via 7237903c66af3997ac754df70cc8d25cefc8d1ae (commit) via f5059038f2bd5eb30ccc8ec2ef55923896437906 (commit) from de5f438aef1dd11c68658683996deab2b0714e0e (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 0f3957ab48f34df8e151ec026dfac0d9d2df5aec Merge: ce96f39 30734c9 Author: Dan McGee <dan(a)archlinux.org> Date: Mon Oct 18 16:52:57 2010 -0500 Merge branch 'maint' commit ce96f39ac9313a3583f346adfd2c709a658fae58 Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Sun Oct 17 12:16:03 2010 +0200 pactest: use valgrind.supp file Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 8f2eaa51c2705a066da3d18af287ec6e0d80c032 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:31:31 2010 +0200 Tests: '-S repo/group' syntax when calling '-S repo/group', only group members in <repo> should should be installed (group members in other repos are ignored) Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 9d0b33fd3327ae6d2b15f50870c0885a2068d492 Author: Jakob Gruber <jakob.gruber(a)gmail.com> Date: Fri Sep 24 14:22:35 2010 +0200 Tests: Sync group which includes ignored pkgs * FS#19854 (--ignore is ignored with groups) * http://www.archlinux.org/pipermail/pacman-dev/2009-June/008847.html (operation aborts when a package from a group is ignored/and user chooses not to install it) If a group member is ignored, we expect a) a question whether to install b) after saying 'no' to a), the ignored member not to be installed c) all other group members to be installed d) pacman to execute successfully Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 7237903c66af3997ac754df70cc8d25cefc8d1ae Author: Xavier Chantry <chantry.xavier(a)gmail.com> Date: Thu Oct 14 19:54:13 2010 +0200 be_package: read force entry and convert to epoch We still need to read force entry in epoch-aware pacman, so that when we install an old force package, EPOCH gets written to the local db. Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit f5059038f2bd5eb30ccc8ec2ef55923896437906 Author: Carlos Diaz <839273(a)gmail.com> Date: Wed Oct 13 00:16:35 2010 -0430 bash_completion: remove upstream deprecated functions Populate $cur and $prev with the new bash-completion 1.2 function, _get_comp_words_by_ref. _get_cword and _get_pword have been deprecated. Signed-off-by: Carlos Diaz <839273(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: contrib/bash_completion.in | 6 ++---- lib/libalpm/be_package.c | 5 +++++ lib/libalpm/remove.c | 4 ++++ lib/libalpm/sync.c | 4 +++- test/pacman/pmtest.py | 2 +- test/pacman/tests/ignore007.py | 23 +++++++++++++++++++++++ test/pacman/tests/sync024.py | 23 +++++++++++++++++++++++ 7 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 test/pacman/tests/ignore007.py create mode 100644 test/pacman/tests/sync024.py hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Add a PKGBUILD-python prototype
by Dimitri Merejkowsky 16 Oct '10

16 Oct '10

Signed-off-by: Dimitri Merejkowsky <yannicklm1337(a)gmail.com> --- Makefile.am | 2 +- PKGBUILD-python.proto | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) create mode 100644 PKGBUILD-python.proto diff --git a/Makefile.am b/Makefile.am index 32a08f7..3a4c81c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST = HACKING # Sample makepkg prototype files pkgdatadir = ${datadir}/${PACKAGE} -dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto proto.install ChangeLog.proto +dist_pkgdata_DATA = PKGBUILD.proto PKGBUILD-split.proto PKGBUILD-python.proto proto.install ChangeLog.proto # run the pactest test suite and vercmp tests check-local: test/pacman test/util src/pacman src/util diff --git a/PKGBUILD-python.proto b/PKGBUILD-python.proto new file mode 100644 index 0000000..23aada7 --- /dev/null +++ b/PKGBUILD-python.proto @@ -0,0 +1,40 @@ +# This is an example PKGBUILD file for installing a python module +# Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=(python) +makedepends=(python) +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +options=() +install= +changelog= +source=($pkgname-$pkgver.tar.gz) +noextract=() +md5sums=() #generate with 'makepkg -g' + +build() { + cd "$srcdir/$pkgname-$pkgver" + python setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python setup.py install --root=$pkgdir +} + +# vim:set ts=2 sw=2 et: -- 1.7.3.1

3 2

[pacman-dev] [PATCH 0/5] RFC: epoch implementation
by Dan McGee 15 Oct '10

15 Oct '10

Hey guys, This is a quick set of patches to implement the use of epoch in our packages, and remove the 'force' option. It adds a lot more flexibility and should prevent weird upgrade/downgrade interaction between different repositories, and also removes the need to munge versions as often. The pacman stuff is pretty well tested via the current suite of pactests, although we will want to add some new tests specifically playing with the epoch value in the test packages. Anyway, thoughts/comments/suggestions welcome. The changes are not too invasive and the only real complexity comes from trying to remain backward and forward compatible. This addresses bugs such as FS#14887, FS#19153, FS#19639 along with many a conversation we've had in the past on this list. -Dan Dan McGee (5): Add epoch support to pacman/libalpm Update documentation to reflect new epoch package variable Make repo-add and makepkg epoch-aware Add epoch support to pactest Update contrib/ for epoch contrib/PKGBUILD.vim | 10 ++++++++-- contrib/bacman | 3 +++ doc/PKGBUILD.5.txt | 22 ++++++++++++---------- doc/pacman.8.txt | 3 +++ lib/libalpm/alpm.h | 2 +- lib/libalpm/be_files.c | 16 +++++++++++++--- lib/libalpm/be_package.c | 2 ++ lib/libalpm/package.c | 24 ++++++++++++++---------- lib/libalpm/package.h | 2 +- scripts/makepkg.sh.in | 6 ++---- scripts/repo-add.sh.in | 7 ++++++- test/pacman/pmdb.py | 18 +++++++----------- test/pacman/pmpkg.py | 5 +++-- test/pacman/util.py | 4 ++++ 14 files changed, 79 insertions(+), 45 deletions(-) -- 1.7.3.1

4 16

Re: [pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities
by Nezmer 14 Oct '10

14 Oct '10

Sent this to Andres, forwarding... ----- Forwarded message from Nezmer <git(a)nezmer.info> ----- Date: Thu, 14 Oct 2010 20:34:15 +0300 From: Nezmer <git(a)nezmer.info> To: Andres Perera <andres.p(a)zoho.com> Subject: Re: [pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities User-Agent: Mutt/1.5.20 (2009-06-14) On Thu, Oct 14, 2010 at 12:47:02PM -0430, Andres Perera wrote: > On Thu, Oct 14, 2010 at 12:41 PM, Nezmer <git(a)nezmer.info> wrote: > > If you're running FreeBSD. The default $TERM in ttyv<int> is cons25(1) and > > it can handle the colours just fine. So I don't know how the hard-coded > > list is relevant. > > > > (1) I heard this vintage default will change soon. > > There's really no stopping at that point; the default terminal in OpenBSD is > "vt220" and it can handle colors, so can Linux's "linux" terminal. > > So it's screwing some terminals up vs. replicating ncurses in Bash -- since > that's exactly what ncurses does, it looks at the TERM string and compares it > to a list. Once this "vintage" changes, I guess makepkg is supposed to be > updated, if the second option is any good. > > Are you proposing that it should check for all these terminals or just grant > these bonuses to those who link against terminfo? First of all, Don't assume I know what I'm talking about. If I say something stupid, please correct me. Currently, makepkg with colours work just fine in FreeBSD's default cons25 term. The patch will assume cons25 can't handle colours and will disable them, right? So, from a user prospective. This does not improve the experience in FreeBSD. Feel free to shout at my stupidity. * PS: xterm is the new default in 9-CURRENT. Hopefully It will make it to STABLE soon If It didn't already. ----- End forwarded message -----

4 6

[pacman-dev] [PATCH 1/3] makepkg: fallback to legacy termcap capabilities
by Carlos Diaz 14 Oct '10

14 Oct '10

In some systems, such as Freebsd, the base tput isn't linked against a terminfo capable ncurses. This means that there's no portable way to set color, so instead of guessing, makepkg fallbacks on using legacy termcap output manipulation. For reference, see terminfo(5) and termcap(5) for a comparison between the abilities. The hardcoded list of terminals is taken from freebsdports/shells/tcshrc and tmux [1]. This prevents echoing gibberish in dumb and otherwise incapacitated terminals. 1: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/tmux/tty.c?rev=1.91;conte… Signed-off-by: Carlos Diaz <839273(a)gmail.com> --- scripts/makepkg.sh.in | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bdf63ef..3d29d26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1660,21 +1660,30 @@ PACMAN=${PACMAN:-pacman} # check if messages are to be printed using color unset ALL_OFF BOLD BLUE GREEN RED YELLOW if [[ -t 2 && ! $USE_COLOR = "n" && $(check_buildenv color) = "y" ]]; then - # prefer terminal safe colored and bold text when tput is supported if tput setaf 0 &>/dev/null; then + # tput linked against a compliant terminfo ncurses ALL_OFF="$(tput sgr0)" BOLD="$(tput bold)" BLUE="${BOLD}$(tput setaf 4)" GREEN="${BOLD}$(tput setaf 2)" RED="${BOLD}$(tput setaf 1)" YELLOW="${BOLD}$(tput setaf 3)" - else + elif [[ $TERM =~ ^(dtterm|rxvt|screen|xterm) ]]; then + # no terminfo, but don't fallback to ugly reverse text just yet ALL_OFF="\033[1;0m" BOLD="\033[1;1m" BLUE="${BOLD}\033[1;34m" GREEN="${BOLD}\033[1;32m" RED="${BOLD}\033[1;31m" YELLOW="${BOLD}\033[1;33m" + elif tput me &>/dev/null; then + # rely on termcap capabilities; no portable way of using color + ALL_OFF="$(tput me)" + BOLD="$(tput md)" + BLUE="$(tput mr)" # reverse + GREEN="$(tput us)" # underline + RED="$(tput so)" # standout + YELLOW="$(tput mh)" # half-bright fi fi readonly ALL_OFF BOLD BLUE GREEN RED YELLOW -- 1.7.3.1

5 10

[pacman-dev] [PATCH 1/4] CLI args: add pactest with an invalid combination
by Xavier Chantry 14 Oct '10

14 Oct '10

From: Jakob Gruber <jakob.gruber(a)gmail.com> Pacman should catch cases in which the passed arguments don't apply to the current operation (sync/query/...) Also see FS#20950 --- test/pacman/tests/pacman005.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/pacman005.py diff --git a/test/pacman/tests/pacman005.py b/test/pacman/tests/pacman005.py new file mode 100644 index 0000000..99c25b2 --- /dev/null +++ b/test/pacman/tests/pacman005.py @@ -0,0 +1,11 @@ +self.description = "Test invalid combination of command line options (-Qy)" + +p = pmpkg("foobar") +self.addpkg2db("local", p) + +self.args = "-Qy" + +self.addrule("PACMAN_RETCODE=1") + +self.expectfailure = True + -- 1.7.3.1

4 15

[pacman-dev] [PATCH 1/3] add 4 pactests for -Sdd
by Xavier Chantry 14 Oct '10

14 Oct '10

Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- test/pacman/tests/sync-sdd1.py | 18 ++++++++++++++++++ test/pacman/tests/sync-sdd2.py | 15 +++++++++++++++ test/pacman/tests/sync-sdd3.py | 15 +++++++++++++++ test/pacman/tests/sync-sdd4.py | 17 +++++++++++++++++ 4 files changed, 65 insertions(+), 0 deletions(-) create mode 100644 test/pacman/tests/sync-sdd1.py create mode 100644 test/pacman/tests/sync-sdd2.py create mode 100644 test/pacman/tests/sync-sdd3.py create mode 100644 test/pacman/tests/sync-sdd4.py diff --git a/test/pacman/tests/sync-sdd1.py b/test/pacman/tests/sync-sdd1.py new file mode 100644 index 0000000..4438ef0 --- /dev/null +++ b/test/pacman/tests/sync-sdd1.py @@ -0,0 +1,18 @@ +self.description = "-Sdd: -Sdd works" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>1.0-1"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sdd %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("PKG_EXIST=pkg2") +self.addrule("PKG_DEPENDS=pkg1|provision>1.0-1") + +self.expectfailure = True diff --git a/test/pacman/tests/sync-sdd2.py b/test/pacman/tests/sync-sdd2.py new file mode 100644 index 0000000..5f1f847 --- /dev/null +++ b/test/pacman/tests/sync-sdd2.py @@ -0,0 +1,15 @@ +self.description = "-Sdd: -S fails" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-S %s" % p1.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") diff --git a/test/pacman/tests/sync-sdd3.py b/test/pacman/tests/sync-sdd3.py new file mode 100644 index 0000000..68733af --- /dev/null +++ b/test/pacman/tests/sync-sdd3.py @@ -0,0 +1,15 @@ +self.description = "-Sdd: -Sd works but no deps" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["provision>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sd %s" % p1.name + +self.addrule("PACMAN_RETCODE=0") +self.addrule("PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") diff --git a/test/pacman/tests/sync-sdd4.py b/test/pacman/tests/sync-sdd4.py new file mode 100644 index 0000000..4cd4b54 --- /dev/null +++ b/test/pacman/tests/sync-sdd4.py @@ -0,0 +1,17 @@ +self.description = "-Sdd: provision does not exist" + +p1 = pmpkg("pkg1", "1.0-2") +p1.depends = ["invalid>=1.0-2"] +self.addpkg2db("sync", p1) + +p2 = pmpkg("pkg2", "1.0-2") +p2.provides = ["provision=1.0-1"] +self.addpkg2db("sync", p2) + +self.args = "-Sdd %s" % p1.name + +self.addrule("PACMAN_RETCODE=1") +self.addrule("!PKG_EXIST=pkg1") +self.addrule("!PKG_EXIST=pkg2") + +self.expectfailure = True -- 1.7.3.1

1 2

[pacman-dev] [PATCH] bash_completion: remove upstream deprecated functions
by Carlos Diaz 14 Oct '10

14 Oct '10

Populate $cur and $prev with the new bash-completion 1.2 function, _get_comp_words_by_ref. _get_cword and _get_pword have been deprecated. Signed-off-by: Carlos Diaz <839273(a)gmail.com> --- contrib/bash_completion.in | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in index bdc4754..7f47f4b 100644 --- a/contrib/bash_completion.in +++ b/contrib/bash_completion.in @@ -30,8 +30,7 @@ _arch_incomp() { _makepkg() { local cur opts prev COMPREPLY=() - cur=$(_get_cword) - prev=${COMP_WORDS[COMP_CWORD-1]} + _get_comp_words_by_ref cur prev if [[ $cur = -* && ! $prev =~ ^-(-(cleancache|config|help)$|\w*[Chp]) ]]; then opts=('allsource asroot clean cleancache config force geninteg help holdver ignorearch install log nobuild nocolor noconfirm nodeps noextract @@ -55,8 +54,7 @@ _pacman_pkg() { _pacman() { local common core cur database prev query remove sync upgrade o COMPREPLY=() - cur=$(_get_cword) - prev=${COMP_WORDS[COMP_CWORD-1]} + _get_comp_words_by_ref cur prev database=('asdeps asexplicit') query=('changelog check deps explicit file foreign groups info list owns search unrequired upgrades' 'c e g i k l m o p s t u') -- 1.7.3.1

3 2