diff -uNr anaconda-11.1.2.36__orig/scripts/pkgorder anaconda-11.1.2.36/scripts/pkgorder --- anaconda-11.1.2.36__orig/scripts/pkgorder 2007-01-26 20:08:39.000000000 +0000 +++ anaconda-11.1.2.36/scripts/pkgorder 2007-03-30 11:44:22.000000000 +0000 @@ -71,13 +71,11 @@ #XXX: sigh processed = {} def processTransaction(ds): - del ds.ts - ds.initActionTs() - ds.populateTs(keepold=0) - ds.ts.check() - ds.ts.order() - for (hdr, path) in ds.ts.ts.getKeys(): - fname = os.path.basename(path) +# ds.tsInfo.makelists() +# print len(ds.tsInfo.installed) +# import pdb; pdb.set_trace() + for pkgtup in ds.tsInfo.sort(): + fname = ds.tsInfo.pkgdict[pkgtup][0].po.returnSimple('relativepath') fpattern = "%s/%s*" % (toppath, fname.rsplit('.', 2)[0]) printMatchingPkgs(fpattern) @@ -187,17 +185,16 @@ "gnome-software-development", "eclipse", "x-software-development", "java-development", "kde-software-development", - "mail-server", "network-server", "legacy-network-server"]) + "mail-server", "legacy-network-server"]) addGroups(ds, ["news-server", "legacy-software-development"]) - #Everthing else but kernels + #Everthing else but kernels - don't depsolve for po in ds.pkgSack.returnPackages(): if po.pkgtup not in ds._installed.returnPackages(): if po.name.find("kernel") == -1: member = ds.tsInfo.addInstall(po) - ds.resolveDeps() processTransaction(ds) os.unlink(config) shutil.rmtree(testpath)