diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-02-22 14:44:16 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-02-22 14:44:16 +0000 |
| commit | 945060b9145c0b6b65f3c0cbf33ceffcce582114 (patch) | |
| tree | ab7a949a0d9ec22bdb1824dffe6c3ac252de0b44 /eclass/webapp.eclass | |
| parent | ppc stable, bug #210946 (diff) | |
| download | gentoo-2-945060b9145c0b6b65f3c0cbf33ceffcce582114.tar.gz gentoo-2-945060b9145c0b6b65f3c0cbf33ceffcce582114.tar.bz2 gentoo-2-945060b9145c0b6b65f3c0cbf33ceffcce582114.zip | |
fix #203463
Diffstat (limited to 'eclass/webapp.eclass')
| -rw-r--r-- | eclass/webapp.eclass | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index c7d555580d3f..a537bf03b024 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.55 2008/02/22 14:33:35 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.56 2008/02/22 14:44:16 hollow Exp $ # # @ECLASS: webapp.eclass # @MAINTAINER: @@ -448,22 +448,32 @@ webapp_pkg_prerm() { local x if ! use vhosts; then - - for x in ${my_output}; do - [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" - if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then - ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} + echo "${my_output}" | while read x; do + if [[ -f "${x}"/.webapp ]]; then + . "${x}"/.webapp + if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then + ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} + fi + else + ewarn "Cannot find file ${x}/.webapp" fi done - else - + elif [[ "${my_output}" != "" ]]; then + echo + ewarn ewarn "Don't forget to use webapp-config to remove any copies of" ewarn "${PN}-${PVR} installed in" ewarn - for x in ${my_output}; do - [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" - ewarn " ${x}" + echo "${my_output}" | while read x; do + if [[ -f "${x}"/.webapp ]]; then + ewarn " ${x}" + else + ewarn "Cannot find file ${x}/.webapp" + fi done + + ewarn + echo fi } |