From cbf4e215e9a86d58cffc0dff1996a83a6d70898b Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Nov 24 2016 09:09:59 +0000 Subject: [PATCH 1/2] Add kerberos realm to config files Signed-off-by: Lubomír Sedlář --- diff --git a/conf/etc/rpkg/fedpkg-stage.conf b/conf/etc/rpkg/fedpkg-stage.conf index f192895..c1f34f5 100644 --- a/conf/etc/rpkg/fedpkg-stage.conf +++ b/conf/etc/rpkg/fedpkg-stage.conf @@ -16,9 +16,10 @@ clone_config = sendemail.to %(module)s-owner@fedoraproject.org push.default simple distgit_namespaced = True +kerberos_realm = STG.FEDORAPROJECT.ORG [fedpkg-stage.bodhi] url = https://bodhi.stg.fedoraproject.org/ [fedpkg-stage.pkgdb] -url = https://admin.stg.fedoraproject.org/pkgdb/ \ No newline at end of file +url = https://admin.stg.fedoraproject.org/pkgdb/ diff --git a/conf/etc/rpkg/fedpkg.conf b/conf/etc/rpkg/fedpkg.conf index b0d132c..167b93b 100644 --- a/conf/etc/rpkg/fedpkg.conf +++ b/conf/etc/rpkg/fedpkg.conf @@ -16,9 +16,10 @@ clone_config = sendemail.to %(module)s-owner@fedoraproject.org push.default simple distgit_namespaced = True +kerberos_realm = FEDORAPROJECT.ORG [fedpkg.bodhi] url = https://bodhi.fedoraproject.org/ [fedpkg.pkgdb] -url = https://admin.fedoraproject.org/pkgdb/ \ No newline at end of file +url = https://admin.fedoraproject.org/pkgdb/ From 6d07d317e06095bbb0a18171568b59b8fd556e03 Mon Sep 17 00:00:00 2001 From: Lubomír Sedlář Date: Nov 24 2016 09:09:59 +0000 Subject: [PATCH 2/2] Accept the realms argument in Commands class Fixes: #14 Signed-off-by: Lubomír Sedlář --- diff --git a/fedpkg/__init__.py b/fedpkg/__init__.py index 93c3bc1..4768805 100644 --- a/fedpkg/__init__.py +++ b/fedpkg/__init__.py @@ -26,8 +26,7 @@ class Commands(pyrpkg.Commands): def __init__(self, path, lookaside, lookasidehash, lookaside_cgi, gitbaseurl, anongiturl, branchre, kojiconfig, - build_client, user=None, dist=None, target=None, - quiet=False, distgit_namespaced=False): + build_client, **kwargs): """Init the object and some configuration details.""" # We are subclassing to set kojiconfig to none, so that we can @@ -35,9 +34,7 @@ class Commands(pyrpkg.Commands): super(Commands, self).__init__(path, lookaside, lookasidehash, lookaside_cgi, gitbaseurl, anongiturl, branchre, kojiconfig, build_client, - user=user, dist=dist, target=target, - quiet=quiet, - distgit_namespaced=distgit_namespaced) + **kwargs) # New data self.secondary_arch = {