#54 Pass gssapi argument to pyrpkg
Closed 7 years ago by puiterwijk. Opened 7 years ago by puiterwijk.
puiterwijk/fedpkg gssapi  into  master

file modified
+10 -2
@@ -106,7 +106,11 @@ 

          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 @@ 

  

          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):

file modified
+2 -2
@@ -19,10 +19,10 @@ 

  

  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')

Requires pyrpkg#107

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

Decided to just always enable it in pyrpkg as it doesn't hurt.

Pull-Request has been closed by puiterwijk

7 years ago