Add --gpgkey option to repo command This will be used to verify packages by pungi, which have no other way to get key location (no real .repo files). Signed-off-by: Marek Marczykowski 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,19 +130,34 @@ RHEL6_RepoData = F14_RepoData -F15_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: + retval += " --gpgkey=\"%s\"" % self.gpgkey + + return retval + + +class F21_RepoData(F15_RepoData): + 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 @@ urlRequired = False + def _getParser(self): + op = F14_Repo._getParser(self) + op.add_option("--gpgkey", action="store", type="string") + return op + class F21_Repo(F15_Repo): removedKeywords = F15_Repo.removedKeywords removedAttrs = F15_Repo.removedAttrs