From 08fc496a3621d5e24c63704c31d2f17b55e60154 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 11 Sep 2008 13:32:01 -0700 Subject: [PATCH] Revert "Yum api changed with regard to adding conditionals. Need to pass in just a name" This reverts commit bc18a1d4f3c0a1b39d02a94f677122468bd07a3e. Reverting because yum api reverted back to the way it was. --- 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 c074db87..9b358fd2 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.searchNames(name=condreq) + pkgs = self.ayum.pkgSack.searchNevra(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([pkg.name for pkg in pkgs]) + self.ayum.tsInfo.conditionals[cond].extend(pkgs) else: - self.ayum.tsInfo.conditionals[cond] = [pkg.name for pkg in pkgs] + self.ayum.tsInfo.conditionals[cond] = pkgs return packages