Branch 'dev/boddie-new/combined' - pykolab/setup

[Paul Boddie]

 pykolab/setup/setup_php.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 80f3525eb609893815f3604ae8dcc551b520f0bc
Author: Paul Boddie <paul at boddie.org.uk>
Date:   Fri Sep 12 21:51:14 2014 +0200

    Fail gracefully in check mode, producing the status.

diff --git a/pykolab/setup/setup_php.py b/pykolab/setup/setup_php.py
index 91885f4..f8e32f6 100644
--- a/pykolab/setup/setup_php.py
+++ b/pykolab/setup/setup_php.py
@@ -82,7 +82,9 @@ def _execute(*args, **kw):
     php_ini = get_php_ini_file()
 
     if not php_ini:
-        if conf.php_ini_path:
+        if conf.check_only:
+            utils.setup_status("php", _("not installed"))
+        elif conf.php_ini_path:
             log.error(_("Cannot configure PHP through %r (No such file or directory)") % (conf.php_ini_path))
         else:
             log.error(_("Could not find PHP configuration file php.ini"))