From 6f89a86f64effbe18e29617d93bc76d2e3a638aa Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Tue, 17 Jan 2017 15:34:21 +0100 Subject: [PATCH] Added warning about user existence. fix #74 --- modoboa_installer/scripts/__init__.py | 2 +- modoboa_installer/system.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modoboa_installer/scripts/__init__.py b/modoboa_installer/scripts/__init__.py index 55b8b73..cfc287a 100644 --- a/modoboa_installer/scripts/__init__.py +++ b/modoboa_installer/scripts/__init__.py @@ -11,7 +11,7 @@ def install(appname, config): if (config.has_option(appname, "enabled") and not config.getboolean(appname, "enabled")): return - utils.printcolor("Installing {}".format(appname), utils.YELLOW) + utils.printcolor("Installing {}".format(appname), utils.MAGENTA) try: script = importlib.import_module( "modoboa_installer.scripts.{}".format(appname)) diff --git a/modoboa_installer/system.py b/modoboa_installer/system.py index bf88374..968d7a3 100644 --- a/modoboa_installer/system.py +++ b/modoboa_installer/system.py @@ -14,6 +14,14 @@ def create_user(name, home=None): except KeyError: pass else: + extra_message = "." + if home: + extra_message = ( + " but please make sure the {} directory exists.".format( + home)) + utils.printcolor( + "User {} already exists, skipping creation{}".format( + name, extra_message), utils.YELLOW) return cmd = "useradd -m " if home: