| 1 |
slords |
1.1 |
diff -uNr anaconda-11.1.2.36__orig/scripts/pkgorder anaconda-11.1.2.36/scripts/pkgorder |
| 2 |
|
|
--- anaconda-11.1.2.36__orig/scripts/pkgorder 2007-01-26 20:08:39.000000000 +0000 |
| 3 |
|
|
+++ anaconda-11.1.2.36/scripts/pkgorder 2007-03-30 11:44:22.000000000 +0000 |
| 4 |
|
|
@@ -71,13 +71,11 @@ |
| 5 |
|
|
#XXX: sigh |
| 6 |
|
|
processed = {} |
| 7 |
|
|
def processTransaction(ds): |
| 8 |
|
|
- del ds.ts |
| 9 |
|
|
- ds.initActionTs() |
| 10 |
|
|
- ds.populateTs(keepold=0) |
| 11 |
|
|
- ds.ts.check() |
| 12 |
|
|
- ds.ts.order() |
| 13 |
|
|
- for (hdr, path) in ds.ts.ts.getKeys(): |
| 14 |
|
|
- fname = os.path.basename(path) |
| 15 |
|
|
+# ds.tsInfo.makelists() |
| 16 |
|
|
+# print len(ds.tsInfo.installed) |
| 17 |
|
|
+# import pdb; pdb.set_trace() |
| 18 |
|
|
+ for pkgtup in ds.tsInfo.sort(): |
| 19 |
|
|
+ fname = ds.tsInfo.pkgdict[pkgtup][0].po.returnSimple('relativepath') |
| 20 |
|
|
fpattern = "%s/%s*" % (toppath, fname.rsplit('.', 2)[0]) |
| 21 |
|
|
printMatchingPkgs(fpattern) |
| 22 |
|
|
|
| 23 |
|
|
@@ -187,17 +185,16 @@ |
| 24 |
|
|
"gnome-software-development", "eclipse", |
| 25 |
|
|
"x-software-development", |
| 26 |
|
|
"java-development", "kde-software-development", |
| 27 |
|
|
- "mail-server", "network-server", "legacy-network-server"]) |
| 28 |
|
|
+ "mail-server", "legacy-network-server"]) |
| 29 |
|
|
|
| 30 |
|
|
addGroups(ds, ["news-server", "legacy-software-development"]) |
| 31 |
|
|
|
| 32 |
|
|
- #Everthing else but kernels |
| 33 |
|
|
+ #Everthing else but kernels - don't depsolve |
| 34 |
|
|
for po in ds.pkgSack.returnPackages(): |
| 35 |
|
|
if po.pkgtup not in ds._installed.returnPackages(): |
| 36 |
|
|
if po.name.find("kernel") == -1: |
| 37 |
|
|
member = ds.tsInfo.addInstall(po) |
| 38 |
|
|
|
| 39 |
|
|
- ds.resolveDeps() |
| 40 |
|
|
processTransaction(ds) |
| 41 |
|
|
os.unlink(config) |
| 42 |
|
|
shutil.rmtree(testpath) |
Parent Directory
| 
Revision Log
| 
Revision Graph
