QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pykickstart: fix repo --gpgkey option patch

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2015-03-23 20:06:25 +01:00 committed by Jon Griffiths
parent f9772ef282
commit 3bfd4282f3
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pykickstart/repo-gpgkey-option.patch
View File

@ -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.orig/pykickstart/commands/repo.py
+++ pykickstart-1.99.22/pykickstart/commands/repo.py +++ pykickstart-1.99.22/pykickstart/commands/repo.py
@@ -130,9 +130,24 @@ @@ -130,19 +130,34 @@
RHEL6_RepoData = F14_RepoData RHEL6_RepoData = F14_RepoData
-F15_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 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: + if self.gpgkey:
+ retval += " --gpgkey=\"%s\"" % 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): +class F21_RepoData(F15_RepoData):
removedKeywords = F14_RepoData.removedKeywords + removedKeywords = F15_RepoData.removedKeywords
removedAttrs = F14_RepoData.removedAttrs + 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 @@ @@ -271,6 +286,11 @@