| 1 |
hollow 08/02/22 14:44:17 |
| 2 |
|
| 3 |
Modified: webapp.eclass |
| 4 |
Log: |
| 5 |
fix #203463 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.56 eclass/webapp.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?rev=1.56&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?rev=1.56&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/webapp.eclass?r1=1.55&r2=1.56 |
| 13 |
|
| 14 |
Index: webapp.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v |
| 17 |
retrieving revision 1.55 |
| 18 |
retrieving revision 1.56 |
| 19 |
diff -u -r1.55 -r1.56 |
| 20 |
--- webapp.eclass 22 Feb 2008 14:33:35 -0000 1.55 |
| 21 |
+++ webapp.eclass 22 Feb 2008 14:44:16 -0000 1.56 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.55 2008/02/22 14:33:35 hollow Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.56 2008/02/22 14:44:16 hollow Exp $ |
| 27 |
# |
| 28 |
# @ECLASS: webapp.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -448,22 +448,32 @@ |
| 31 |
|
| 32 |
local x |
| 33 |
if ! use vhosts; then |
| 34 |
- |
| 35 |
- for x in ${my_output}; do |
| 36 |
- [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" |
| 37 |
- if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then |
| 38 |
- ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} |
| 39 |
+ echo "${my_output}" | while read x; do |
| 40 |
+ if [[ -f "${x}"/.webapp ]]; then |
| 41 |
+ . "${x}"/.webapp |
| 42 |
+ if [[ -n "${WEB_HOSTNAME}" && -n "${WEB_INSTALLDIR}" ]]; then |
| 43 |
+ ${WEBAPP_CONFIG} -C -h ${WEB_HOSTNAME} -d ${WEB_INSTALLDIR} |
| 44 |
+ fi |
| 45 |
+ else |
| 46 |
+ ewarn "Cannot find file ${x}/.webapp" |
| 47 |
fi |
| 48 |
done |
| 49 |
- else |
| 50 |
- |
| 51 |
+ elif [[ "${my_output}" != "" ]]; then |
| 52 |
+ echo |
| 53 |
+ ewarn |
| 54 |
ewarn "Don't forget to use webapp-config to remove any copies of" |
| 55 |
ewarn "${PN}-${PVR} installed in" |
| 56 |
ewarn |
| 57 |
|
| 58 |
- for x in ${my_output}; do |
| 59 |
- [[ -f ${x}/.webapp ]] && . ${x}/.webapp || ewarn "Cannot find file ${x}/.webapp" |
| 60 |
- ewarn " ${x}" |
| 61 |
+ echo "${my_output}" | while read x; do |
| 62 |
+ if [[ -f "${x}"/.webapp ]]; then |
| 63 |
+ ewarn " ${x}" |
| 64 |
+ else |
| 65 |
+ ewarn "Cannot find file ${x}/.webapp" |
| 66 |
+ fi |
| 67 |
done |
| 68 |
+ |
| 69 |
+ ewarn |
| 70 |
+ echo |
| 71 |
fi |
| 72 |
} |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives