diff options
| author |   Benedikt Boehm <hollow@gentoo.org> | 2008-03-23 00:11:20 +0000 |
|---|---|---|
| committer | Benedikt Boehm <hollow@gentoo.org> | 2008-03-23 00:11:20 +0000 |
| commit | 5ad82a6686c1d2627ba9f4a0f768e24f5fac2991 (patch) | |
| tree | 512084fefd75f4bdb0fa1f622ed416b61ae3b81e /eclass | |
| parent | fix metadata (diff) | |
| download | gentoo-2-5ad82a6686c1d2627ba9f4a0f768e24f5fac2991.tar.gz gentoo-2-5ad82a6686c1d2627ba9f4a0f768e24f5fac2991.tar.bz2 gentoo-2-5ad82a6686c1d2627ba9f4a0f768e24f5fac2991.zip | |
fix documentation; move sanity check
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/webapp.eclass | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/eclass/webapp.eclass b/eclass/webapp.eclass index 5f8d8d39adf7..193ca86afff3 100644 --- a/eclass/webapp.eclass +++ b/eclass/webapp.eclass @@ -1,7 +1,7 @@ # 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.62 2008/03/04 18:54:41 hollow Exp $ -# +# $Header: /var/cvsroot/gentoo-x86/eclass/webapp.eclass,v 1.63 2008/03/23 00:11:20 hollow Exp $ + # @ECLASS: webapp.eclass # @MAINTAINER: # web-apps@gentoo.org @@ -12,7 +12,7 @@ # @ECLASS-VARIABLE: WEBAPP_DEPEND # @DESCRIPTION: -# An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be build, most +# An ebuild should use WEBAPP_DEPEND if a custom DEPEND needs to be built, most # notably in combination with WEBAPP_OPTIONAL. WEBAPP_DEPEND=">=app-admin/webapp-config-1.50.15" @@ -139,7 +139,7 @@ webapp_getinstalltype() { # @FUNCTION: need_httpd # @DESCRIPTION: -# Call this function AFTER your ebuild's DEPEND line if any of the available +# Call this function AFTER your ebuilds DEPEND line if any of the available # webservers are able to run this application. need_httpd() { DEPEND="${DEPEND} @@ -148,7 +148,7 @@ need_httpd() { # @FUNCTION: need_httpd_cgi # @DESCRIPTION: -# Call this function AFTER your ebuild's DEPEND line if any of the available +# Call this function AFTER your ebuilds DEPEND line if any of the available # CGI-capable webservers are able to run this application. need_httpd_cgi() { DEPEND="${DEPEND} @@ -157,7 +157,7 @@ need_httpd_cgi() { # @FUNCTION: need_httpd_fastcgi # @DESCRIPTION: -# Call this function AFTER your ebuild's DEPEND line if any of the available +# Call this function AFTER your ebuilds DEPEND line if any of the available # FastCGI-capabale webservers are able to run this application. need_httpd_fastcgi() { DEPEND="${DEPEND} @@ -321,6 +321,20 @@ webapp_sqlscript() { webapp_src_preinst() { debug-print-function $FUNCNAME $* + # sanity checks, to catch bugs in the ebuild + if [[ ! -f "${T}/${SETUP_CHECK_FILE}" ]]; then + eerror + eerror "This ebuild did not call webapp_pkg_setup() at the beginning" + eerror "of the pkg_setup() function" + eerror + eerror "Please log a bug on http://bugs.gentoo.org" + eerror + eerror "You should use emerge -C to remove this package, as the" + eerror "installation is incomplete" + eerror + die "Ebuild did not call webapp_pkg_setup() - report to http://bugs.gentoo.org" + fi + dodir "${MY_HTDOCSDIR}" dodir "${MY_HOSTROOTDIR}" dodir "${MY_CGIBINDIR}" @@ -416,20 +430,6 @@ webapp_src_install() { # webapp_pkg_postinst() within the same shell process touch "${D}/${MY_APPDIR}/${INSTALL_CHECK_FILE}" - # sanity checks, to catch bugs in the ebuild - if [[ ! -f "${T}/${SETUP_CHECK_FILE}" ]]; then - eerror - eerror "This ebuild did not call webapp_pkg_setup() at the beginning" - eerror "of the pkg_setup() function" - eerror - eerror "Please log a bug on http://bugs.gentoo.org" - eerror - eerror "You should use emerge -C to remove this package, as the" - eerror "installation is incomplete" - eerror - die "Ebuild did not call webapp_pkg_setup() - report to http://bugs.gentoo.org" - fi - chown -R "${VHOST_DEFAULT_UID}:${VHOST_DEFAULT_GID}" "${D}/" chmod -R u-s "${D}/" chmod -R g-s "${D}/" |