From 64f093d434fc255b5da97320c293c8d2d20f0aa3 Mon Sep 17 00:00:00 2001
From: Isis Lovecruft <isis@leap.se>
Date: Mon, 3 Jun 2013 11:35:59 +0000
Subject: [PATCH] Add GPG.keyserver to settings printout.

---
 src/gnupg.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/gnupg.py b/src/gnupg.py
index 99bda6e..05c2a4d 100644
--- a/src/gnupg.py
+++ b/src/gnupg.py
@@ -114,24 +114,24 @@ class GPG(GPGBase):
             home=homedir,
             keyring=keyring,
             secring=secring,
-            default_preference_list=default_preference_list,
             options=options,
             verbose=verbose,
             use_agent=use_agent,)
 
-        log.info("""
-Initialised settings:
-binary: %s
-homedir: %s
-keyring: %s
-secring: %s
-default_preference_list: %s
-options: %s
-verbose: %s
-use_agent: %s
+        log.info(textwrap.dedent("""
+        Initialised settings:
+        binary: %s
+        homedir: %s
+        keyring: %s
+        secring: %s
+        default_preference_list: %s
+        keyserver: %s
+        options: %s
+        verbose: %s
+        use_agent: %s
         """ % (self.binary, self.homedir, self.keyring, self.secring,
-               self.default_preference_list, self.options, str(self.verbose),
-               str(self.use_agent)))
+               self.default_preference_list, self.keyserver, self.options,
+               str(self.verbose), str(self.use_agent))))
 
         self._batch_dir = os.path.join(self.homedir, 'batch-files')
         self._key_dir  = os.path.join(self.homedir, 'generated-keys')