diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2012-06-23 14:58:17 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2012-06-23 14:58:17 +0000 |
| commit | c3b8a05709eb27a51fe9318f3a964c6819d168c6 (patch) | |
| tree | fefb5bc303902008ae81ed78900a3f780b0b07dc | |
| parent | Version bump for beta channel release. (diff) | |
| download | gentoo-2-c3b8a05709eb27a51fe9318f3a964c6819d168c6.tar.gz gentoo-2-c3b8a05709eb27a51fe9318f3a964c6819d168c6.tar.bz2 gentoo-2-c3b8a05709eb27a51fe9318f3a964c6819d168c6.zip | |
Make channel discovery more strict
| -rw-r--r-- | eclass/php-pear-lib-r1.eclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index e1970bb425c0..4e212ae51b4e 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.24 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.25 2012/06/23 14:58:17 olemarkus Exp $ # @ECLASS: php-pear-lib-r1.eclass # @MAINTAINER: @@ -38,10 +38,9 @@ fi php-pear-lib-r1_pkg_setup() { if [[ -n $PHP_PEAR_CHANNEL ]] ; then if [[ -f $PHP_PEAR_CHANNEL ]]; then - pear channel-add $PHP_PEAR_CHANNEL + pear channel-add $PHP_PEAR_CHANNEL || einfo "Ignore any errors about existing channels" else - pear channel-discover $PHP_PEAR_CHANNEL - pear channel-update $PHP_PEAR_CHANNEL + die "Could not find channel file $PHP_PEAR_CHANNEL" fi fi } |