From 3bfd4282f3f14dd942adfc5986239fdfbd39113d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Mon, 23 Mar 2015 20:06:25 +0100
Subject: [PATCH] pykickstart: fix repo --gpgkey option patch

---
 pykickstart/repo-gpgkey-option.patch | 40 ++++++++++++++++++----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pykickstart/repo-gpgkey-option.patch b/pykickstart/repo-gpgkey-option.patch
index c4d27e5..f4ff1cf 100644
--- a/pykickstart/repo-gpgkey-option.patch
+++ b/pykickstart/repo-gpgkey-option.patch
@@ -8,23 +8,25 @@ Index: pykickstart-1.99.22/pykickstart/commands/repo.py
 ===================================================================
 --- pykickstart-1.99.22.orig/pykickstart/commands/repo.py
 +++ pykickstart-1.99.22/pykickstart/commands/repo.py
-@@ -130,9 +130,24 @@
+@@ -130,19 +130,34 @@
  
  RHEL6_RepoData = F14_RepoData
  
 -F15_RepoData = F14_RepoData
-+class F15_RepoData(F14_RepoData):
-+    removedKeywords = F14_RepoData.removedKeywords
-+    removedAttrs = F14_RepoData.removedAttrs
-+
-+    def __init__(self, *args, **kwargs):
-+        F14_RepoData.__init__(self, *args, **kwargs)
-+        self.gpgkey = kwargs.get("gpgkey", None)
-+
-+    def _getArgsAsStr(self):
-+        retval = F14_RepoData._getArgsAsStr(self)
- 
+-
 -class F21_RepoData(F14_RepoData):
++class F15_RepoData(F14_RepoData):
+     removedKeywords = F14_RepoData.removedKeywords
+     removedAttrs = F14_RepoData.removedAttrs
+ 
+     def __init__(self, *args, **kwargs):
+         F14_RepoData.__init__(self, *args, **kwargs)
+-        self.install = kwargs.get("install", False)
++        self.gpgkey = kwargs.get("gpgkey", None)
+ 
+     def _getArgsAsStr(self):
+         retval = F14_RepoData._getArgsAsStr(self)
+ 
 +        if self.gpgkey:
 +            retval += " --gpgkey=\"%s\"" % self.gpgkey
 +
@@ -32,8 +34,18 @@ Index: pykickstart-1.99.22/pykickstart/commands/repo.py
 +
 +
 +class F21_RepoData(F15_RepoData):
-     removedKeywords = F14_RepoData.removedKeywords
-     removedAttrs = F14_RepoData.removedAttrs
++    removedKeywords = F15_RepoData.removedKeywords
++    removedAttrs = F15_RepoData.removedAttrs
++
++    def __init__(self, *args, **kwargs):
++        F15_RepoData.__init__(self, *args, **kwargs)
++        self.install = kwargs.get("install", False)
++
++    def _getArgsAsStr(self):
++        retval = F15_RepoData._getArgsAsStr(self)
++
+         if self.install:
+             retval += " --install"
  
 @@ -271,6 +286,11 @@