URL: https://github.com/freeipa/freeipa/pull/527
Author: stlaz
 Title: #527: Fix replica with --setup-ca issues
Action: opened

PR body:
"""
nolog argument of ipautil.run requires tuple, not a string.

https://fedorahosted.org/freeipa/ticket/5695

I am a bad person.
"""

To pull the PR as Git branch:
git remote add ghfreeipa https://github.com/freeipa/freeipa
git fetch ghfreeipa pull/527/head:pr527
git checkout pr527
From 80534d4788b47a13d4eae469c33b49c2ebf0c112 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slazn...@redhat.com>
Date: Wed, 1 Mar 2017 14:07:44 +0100
Subject: [PATCH] Fix replica with --setup-ca issues

nolog argument of ipautil.run requires tuple, not a string.

https://fedorahosted.org/freeipa/ticket/5695
---
 ipaserver/secrets/store.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipaserver/secrets/store.py b/ipaserver/secrets/store.py
index 6a448a3..56cbfbc 100644
--- a/ipaserver/secrets/store.py
+++ b/ipaserver/secrets/store.py
@@ -207,7 +207,7 @@ def export_key(self):
             args.extend(["-inkey", self.keyfile])
 
         try:
-            ipautil.run(args, nolog=password)
+            ipautil.run(args, nolog=(password, ))
             with open(tmpfile, 'r') as f:
                 data = f.read()
         finally:
@@ -231,7 +231,7 @@ def import_key(self, value):
                          "-clcerts", "-nokeys",
                          "-out", self.certfile,
                          "-passin", "pass:{pwd}".format(pwd=password)],
-                        nolog=(password))
+                        nolog=(password, ))
 
             if self.keyfile is not None:
                 # get the private key from the file
@@ -241,7 +241,7 @@ def import_key(self, value):
                              "-nocerts", "-nodes",
                              "-out", self.keyfile,
                              "-passin", "pass:{pwd}".format(pwd=password)],
-                            nolog=(password))
+                            nolog=(password, ))
         finally:
             os.remove(tmpdata)
 
-- 
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

Reply via email to