|
 |
403b09 |
From c92d242a215c7fb312aaeb07dd02f5783aec1817 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Martin Basti <mbasti@redhat.com>
|
|
|
403b09 |
Date: Thu, 28 Jul 2016 09:47:39 +0200
|
|
|
403b09 |
Subject: [PATCH] Do not initialize API in ipa-client-automount uninstall
|
|
|
403b09 |
|
|
|
403b09 |
API is not needed in uninstallation, it may only produce errors.
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6072
|
|
|
403b09 |
|
|
|
403b09 |
Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
client/ipa-client-automount | 6 +++---
|
|
|
403b09 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/client/ipa-client-automount b/client/ipa-client-automount
|
|
|
403b09 |
index f06aa7f8d53ba2528bc2c023792771d5fd341e7c..08209c849f155a8394acddc6bb961be8fa68073c 100755
|
|
|
403b09 |
--- a/client/ipa-client-automount
|
|
|
403b09 |
+++ b/client/ipa-client-automount
|
|
|
403b09 |
@@ -378,6 +378,9 @@ def main():
|
|
|
403b09 |
paths.IPACLIENT_INSTALL_LOG, verbose=False, debug=options.debug,
|
|
|
403b09 |
filemode='a', console_format='%(message)s')
|
|
|
403b09 |
|
|
|
403b09 |
+ if options.uninstall:
|
|
|
403b09 |
+ return uninstall(fstore, statestore)
|
|
|
403b09 |
+
|
|
|
403b09 |
cfg = dict(
|
|
|
403b09 |
context='cli_installer',
|
|
|
403b09 |
in_server=False,
|
|
|
403b09 |
@@ -392,9 +395,6 @@ def main():
|
|
|
403b09 |
if os.path.exists(paths.IPA_CA_CRT):
|
|
|
403b09 |
ca_cert_path = paths.IPA_CA_CRT
|
|
|
403b09 |
|
|
|
403b09 |
- if options.uninstall:
|
|
|
403b09 |
- return uninstall(fstore, statestore)
|
|
|
403b09 |
-
|
|
|
403b09 |
if statestore.has_state('autofs'):
|
|
|
403b09 |
sys.exit('automount is already configured on this system.\n')
|
|
|
403b09 |
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|