From bc18a1d4f3c0a1b39d02a94f677122468bd07a3e Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 11 Aug 2008 22:47:39 -0400 Subject: [PATCH] Yum api changed with regard to adding conditionals. Need to pass in just a name rather than a package object. Also call searchName since that's all we care about. --- src/pypungi/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 08a3d975..a7736003 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -298,13 +298,13 @@ class Pungi(pypungi.PungiBase): # of the package objects it would bring in. To be used later if # we match the conditional. for condreq, cond in groupobj.conditional_packages.iteritems(): - pkgs = self.ayum.pkgSack.searchNevra(name=condreq) + pkgs = self.ayum.pkgSack.searchNames(name=condreq) if pkgs: pkgs = self.ayum.bestPackagesFromList(pkgs, arch=self.ayum.compatarch) if self.ayum.tsInfo.conditionals.has_key(cond): - self.ayum.tsInfo.conditionals[cond].extend(pkgs) + self.ayum.tsInfo.conditionals[cond].extend([pkg.name for pkg in pkgs]) else: - self.ayum.tsInfo.conditionals[cond] = pkgs + self.ayum.tsInfo.conditionals[cond] = [pkg.name for pkg in pkgs] return packages