diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2009-12-31 15:57:04 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2009-12-31 15:57:04 +0000 |
| commit | c9afe94561024c89d30cad45ce105f8058c4a4a0 (patch) | |
| tree | 67f5d1e9bf564247c562b56b34282a2a8e81b77f /eclass/bash-completion.eclass | |
| parent | Marking cheese-2.24.3 ~ppc64 for bug 287051 (diff) | |
| download | gentoo-2-c9afe94561024c89d30cad45ce105f8058c4a4a0.tar.gz gentoo-2-c9afe94561024c89d30cad45ce105f8058c4a4a0.tar.bz2 gentoo-2-c9afe94561024c89d30cad45ce105f8058c4a4a0.zip | |
Add a test for app-admin/eselect around RDEPEND to avoid circular dependencies.
Clarify elog message.
Diffstat (limited to 'eclass/bash-completion.eclass')
| -rw-r--r-- | eclass/bash-completion.eclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/eclass/bash-completion.eclass b/eclass/bash-completion.eclass index b69d331d53fb..48eefb094208 100644 --- a/eclass/bash-completion.eclass +++ b/eclass/bash-completion.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.21 2009/02/21 20:17:01 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.22 2009/12/31 15:57:04 ulm Exp $ # @ECLASS: bash-completion.eclass # @MAINTAINER: @@ -21,7 +21,10 @@ EXPORT_FUNCTIONS pkg_postinst IUSE="bash-completion" -RDEPEND="bash-completion? ( app-admin/eselect )" +# Allow eclass to be inherited by eselect without a circular dependency +if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then + RDEPEND="bash-completion? ( app-admin/eselect )" +fi # @FUNCTION: dobashcompletion # @USAGE: < file > [ new_file ] @@ -48,7 +51,8 @@ dobashcompletion() { # The bash-completion pkg_postinst function, which is exported bash-completion_pkg_postinst() { if useq bash-completion ; then - elog "To enable command-line completion for ${PN}, run:" + elog "In the case that you haven't yet enabled command-line completion" + elog "for ${PN}, you can run:" elog elog " eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}" elog |