From 2ac8d7a7010eed3618d515908d86098f5a2aca9c Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Nov 22 2016 21:41:31 +0000
Subject: only use default certs if they exist


---

diff --git a/koji/__init__.py b/koji/__init__.py
index 1885694..3dce6bf 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -1570,9 +1570,9 @@ def read_config(profile_name, user_config=None):
         'poll_interval': 5,
         'krbservice': 'host',
         'krb_rdns': True,
-        'cert': '~/.koji/client.crt',
+        'cert': None,
         'ca': '',  # FIXME: remove in next major release
-        'serverca': '~/.koji/serverca.crt',
+        'serverca': None,
         'authtype': None
     }
 
@@ -1642,6 +1642,19 @@ def read_config(profile_name, user_config=None):
         sys.stderr.write("Warning: no configuration for profile name: %s\n" % profile_name)
         sys.stderr.flush()
 
+    # special handling for cert defaults
+    cert_defaults = {
+        'cert': '~/.koji/client.crt',
+        'serverca': '~/.koji/serverca.crt',
+        }
+    for name in cert_defaults:
+        if result.get(name) is None:
+            fn = cert_defaults[name]
+            if os.path.exists(fn):
+                result[name] = fn
+            else:
+                result[name] = ''
+
     return result