2005-12-15 Jeremy Katz <katzj@redhat.com>

	* scripts/pkgorder: Fix for new group code.

2 files changed, 5 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 314ea850d..8c7daae7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-15  Jeremy Katz  <katzj@redhat.com>
+
+	* scripts/pkgorder: Fix for new group code.
+
 2005-12-15  Chris Lumens  <clumens@redhat.com>
 
 	* iutil.py (getArch, getfd, getPPCMachine):  Wrap the rhpl functions
diff --git a/scripts/pkgorder b/scripts/pkgorder
index dc712a380..e6089ff55 100755
--- a/scripts/pkgorder
+++ b/scripts/pkgorder
@@ -31,20 +31,6 @@ class PackageOrderer(YumSorter):
         self.arch = arch
         self._installed = PackageSack()
 
-    def addGroup(self, group):
-        pkgs = []
-        availpackages =  {}
-
-        for po in self.pkgSack.returnPackages():
-            availpackages[po.name] = po
-
-        if self.groupInfo.groupExists(group):
-            pkglist = self.groupInfo.pkgTree(group)
-            for pkg in pkglist:
-                if availpackages.has_key(pkg):
-                    pkgs.append(pkg)
-                    self.tsInfo.addInstall(availpackages[pkg])
-
     def setup(self, fn="/etc/yum.conf", root="/", excludes=[]):
         self.doConfigSetup(fn, root)
         if hasattr(self.repos, 'sqlite'):
@@ -95,7 +81,7 @@ def printMatchingPkgs(fpattern):
 
 def addGroups(ds, groupLst):
     ds.initActionTs()
-    map(ds.addGroup, groupLst)
+    map(ds.selectGroup, groupLst)
     ds.resolveDeps()
     processTransaction(ds)