URL: https://github.com/freeipa/freeipa/pull/184
Author: simo5
Title: #184: Minor install script fixes
Action: synchronized
To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/184/head:pr184
git checkout pr184
From 68db42a636314be935a519b14ae51b2084e96c7b Mon Sep 17 00:00:00 2001
From: Simo Sorce <s...@redhat.com>
Date: Wed, 5 Oct 2016 15:16:30 -0400
Subject: [PATCH 1/2] Fix error message encoding
- Use the correct unicode string for an error message, otherwise an
exception will generate another exception about incorrect type,
masking the original error.
Signed-off-by: Simo Sorce <s...@redhat.com>
---
ipalib/rpc.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ipalib/rpc.py b/ipalib/rpc.py
index 9594ab5..7756eaf 100644
--- a/ipalib/rpc.py
+++ b/ipalib/rpc.py
@@ -603,7 +603,8 @@ def _auth_complete(self, response):
except (TypeError, UnicodeError):
pass
if not token:
- raise KerberosError(message="No valid Negotiate header in server response")
+ raise KerberosError(
+ message=u"No valid Negotiate header in server response")
token = self._sec_context.step(token=token)
if self._sec_context.complete:
self._sec_context = None
From 934f25186aec92d73715286b278adf9b86042a0c Mon Sep 17 00:00:00 2001
From: Simo Sorce <s...@redhat.com>
Date: Mon, 24 Oct 2016 13:06:10 -0400
Subject: [PATCH 2/2] Fix install scripts debugging
- Make sure to pass down the debug flag to ipa-client-install when
the server install is run in debug mode
Signed-off-by: Simo Sorce <s...@redhat.com>
---
ipaserver/install/server/install.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index 0015a8c..2ddc7cc 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -896,6 +896,8 @@ def install(installer):
args.append("--no-sshd")
if options.mkhomedir:
args.append("--mkhomedir")
+ if options.debug:
+ args.append("--debug")
run(args, redirect_output=True)
print()
except Exception:
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
