From 1942c53a878a7d20275dcdb15c405335cc7d32b1 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <puiterwijk@redhat.com>
Date: Oct 14 2016 21:26:31 +0000
Subject: Pass gssapi argument to pyrpkg


Requires pyrpkg#107

Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>

---

diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py
index 0fae271..56016ee 100644
--- a/fedpkg/__init__.py
+++ b/fedpkg/__init__.py
@@ -106,7 +106,11 @@ class Commands(pyrpkg.Commands):
         We override this from pyrpkg because we actually need a client-side
         certificate.
         """
-        return os.path.expanduser('~/.fedora.cert')
+        path = os.path.expanduser('~/.fedora.cert')
+        if os.path.exists(path):
+            return path
+        else:
+            return None
 
     @cached_property
     def ca_cert(self):
@@ -123,9 +127,13 @@ class Commands(pyrpkg.Commands):
 
         We override this because we need a different download path.
         """
+        gssapi = True
+        if self.cert_file:
+            gssapi = False
+
         return FedoraLookasideCache(
             self.lookasidehash, self.lookaside, self.lookaside_cgi,
-            client_cert=self.cert_file, ca_cert=self.ca_cert)
+            client_cert=self.cert_file, ca_cert=self.ca_cert, gssapi=gssapi)
 
     # Overloaded property loaders
     def load_rpmdefines(self):
diff --git a/fedpkg/lookaside.py b/fedpkg/lookaside.py
index c679151..e73427f 100644
--- a/fedpkg/lookaside.py
+++ b/fedpkg/lookaside.py
@@ -19,10 +19,10 @@ from pyrpkg.lookaside import CGILookasideCache
 
 class FedoraLookasideCache(CGILookasideCache):
     def __init__(self, hashtype, download_url, upload_url,
-                 client_cert=None, ca_cert=None):
+                 client_cert=None, ca_cert=None, gssapi=False):
         super(FedoraLookasideCache, self).__init__(
             hashtype, download_url, upload_url, client_cert=client_cert,
-            ca_cert=ca_cert)
+            ca_cert=ca_cert, gssapi=gssapi)
 
         self.download_path = (
             '%(name)s/%(filename)s/%(hashtype)s/%(hash)s/%(filename)s')