diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2012-03-18 21:55:29 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-03-18 21:56:28 +0100 |
| commit | d02d5fb331095f0d8e703a814a0830315d85f76c (patch) | |
| tree | 640c2303bb6974747421612e6af62e87d9886409 /debian/debhelper/apache2-maintscript-helper | |
| parent | 461b27ae0a42778586fb54236c3336ce416e5095 (diff) | |
| download | apache2-d02d5fb331095f0d8e703a814a0830315d85f76c.tar.gz | |
apache2-maintscript-helper improvements
- put EXPORT_APACHE2_MAINTSCRIPT_HELPER check inside helper
- some docs tweaks
Diffstat (limited to 'debian/debhelper/apache2-maintscript-helper')
| -rw-r--r-- | debian/debhelper/apache2-maintscript-helper | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/debian/debhelper/apache2-maintscript-helper b/debian/debhelper/apache2-maintscript-helper index 679175ff..a89b4c1d 100644 --- a/debian/debhelper/apache2-maintscript-helper +++ b/debian/debhelper/apache2-maintscript-helper @@ -18,6 +18,9 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +if [ -z "${EXPORT_APACHE2_MAINTSCRIPT_HELPER:-} ] ; then + return +fi EXPORT_APACHE2_MAINTSCRIPT_HELPER=1 # @@ -68,7 +71,7 @@ apache2_switch_mpm() return 1 fi - CUR_MPM=$(a2query -M) || return 1 + local CUR_MPM=$(a2query -M) || return 1 if [ $CUR_MPM != $MPM ] ; then a2dismod -q "mpm_$CUR_MPM"; |