diff options
| author |   Stuart Herbert <stuart@gentoo.org> | 2006-06-15 07:01:01 +0000 |
|---|---|---|
| committer | Stuart Herbert <stuart@gentoo.org> | 2006-06-15 07:01:01 +0000 |
| commit | fe6e568c1899f7124d7a71506683447cd4d04035 (patch) | |
| tree | 8032ec524d6a1a94b92acb02b99fd7df51054795 /eclass | |
| parent | Stable on ppc64; bug #136201 (diff) | |
| download | gentoo-2-fe6e568c1899f7124d7a71506683447cd4d04035.tar.gz gentoo-2-fe6e568c1899f7124d7a71506683447cd4d04035.tar.bz2 gentoo-2-fe6e568c1899f7124d7a71506683447cd4d04035.zip | |
Make the eclass less chatty when all is good
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/webapp.eclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index accaf9f9db30..638fc01bf9bc 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.41 2006/05/19 19:24:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.42 2006/06/15 07:01:01 stuart Exp $ # # eclass/webapp.eclass # Eclass for installing applications to run under a web server @@ -378,14 +378,11 @@ function webapp_pkg_setup () local my_output if [ -d "${my_dir}" ] ; then - einfo "You already have something installed in ${my_dir}" - einfo "Are you trying to install over the top of something I cannot upgrade?" - my_output="$(webapp_check_installedat)" if [ "$?" != "0" ]; then - # okay, whatever is there, it isn't webapp-config-compatible + ewarn "You already have something installed in ${my_dir}" ewarn ewarn "Whatever is in ${my_dir}, it's not" ewarn "compatible with webapp-config." @@ -396,10 +393,6 @@ function webapp_pkg_setup () eerror "${my_dir} contains ${my_output}" eerror "I cannot upgrade that" die "Cannot upgrade contents of ${my_dir}" - else - einfo - einfo "I can upgrade the contents of ${my_dir}" - einfo fi fi fi |