From a0eaa742343de194ecef2ff7c9e3c74e7f35f51f Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 1 May 2018 08:56:10 -0400 Subject: [PATCH] Client install should handle automount unconfigured on uninstall ipa-client-automount now returns CLIENT_NOT_CONFIGURED when it is not configured. Handle this in uninstall(). https://pagure.io/freeipa/issue/7396 Signed-off-by: Rob Crittenden Reviewed-By: Tibor Dudlak --- ipaclient/install/client.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ipaclient/install/client.py b/ipaclient/install/client.py index cdfde085a..e6557f6a0 100644 --- a/ipaclient/install/client.py +++ b/ipaclient/install/client.py @@ -3056,9 +3056,10 @@ def uninstall(options): try: run([paths.IPA_CLIENT_AUTOMOUNT, "--uninstall", "--debug"]) - except Exception as e: - logger.error( - "Unconfigured automount client failed: %s", str(e)) + except CalledProcessError as e: + if e.returncode != CLIENT_NOT_CONFIGURED: + logger.error( + "Unconfigured automount client failed: %s", str(e)) # Reload the state as automount unconfigure may have modified it fstore._load()