| 1 |
slords |
1.2 |
diff -uNr anaconda-11.1.2.87__orig/scripts/pkgorder anaconda-11.1.2.87/scripts/pkgorder |
| 2 |
|
|
--- anaconda-11.1.2.87__orig/scripts/pkgorder 2007-05-10 18:50:46.000000000 +0100 |
| 3 |
|
|
+++ anaconda-11.1.2.87/scripts/pkgorder 2007-11-22 02:02:47.000000000 +0000 |
| 4 |
|
|
@@ -71,25 +71,18 @@ |
| 5 |
slords |
1.1 |
#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 |
slords |
1.2 |
- fpattern = "%s*" % fname.rsplit('.', 2)[0] |
| 16 |
slords |
1.1 |
+# ds.tsInfo.makelists() |
| 17 |
|
|
+# print len(ds.tsInfo.installed) |
| 18 |
|
|
+# import pdb; pdb.set_trace() |
| 19 |
|
|
+ for pkgtup in ds.tsInfo.sort(): |
| 20 |
|
|
+ fname = ds.tsInfo.pkgdict[pkgtup][0].po.returnSimple('relativepath') |
| 21 |
slords |
1.2 |
+ fpattern = "%s/%s*" % (toppath, fname.rsplit('.', 2)[0]) |
| 22 |
slords |
1.1 |
printMatchingPkgs(fpattern) |
| 23 |
|
|
|
| 24 |
slords |
1.2 |
def printMatchingPkgs(fpattern): |
| 25 |
|
|
global processed |
| 26 |
|
|
|
| 27 |
|
|
- if os.path.isdir("%s/%s/RPMS" % (toppath, product)): |
| 28 |
|
|
- matches = glob.glob("%s/%s/RPMS/%s" % (toppath, product, fpattern)) |
| 29 |
|
|
- elif os.path.isdir("%s/%s" %(toppath, product)): |
| 30 |
|
|
- matches = glob.glob("%s/%s/%s" % (toppath, product, fpattern)) |
| 31 |
|
|
- else: |
| 32 |
|
|
- matches = glob.glob("%s/%s" % (toppath, fpattern)) |
| 33 |
|
|
+ matches = glob.glob(fpattern) |
| 34 |
|
|
|
| 35 |
|
|
for match in matches: |
| 36 |
|
|
mname = os.path.basename(match) |
| 37 |
|
|
@@ -153,7 +146,12 @@ |
| 38 |
|
|
arch = "i686" |
| 39 |
|
|
|
| 40 |
|
|
# print out kernel related packages first |
| 41 |
|
|
- printMatchingPkgs("kernel-*") |
| 42 |
|
|
+ if os.path.isdir("%s/%s/RPMS" % (toppath, product)): |
| 43 |
|
|
+ printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "kernel-*")) |
| 44 |
|
|
+ elif os.path.isdir("%s/%s" %(toppath, product)): |
| 45 |
|
|
+ printMatchingPkgs("%s/%s/%s" % (toppath, product, "kernel-*")) |
| 46 |
|
|
+ else: |
| 47 |
|
|
+ printMatchingPkgs("%s/%s" % (toppath, "kernel-*")) |
| 48 |
|
|
|
| 49 |
|
|
testpath = "/tmp/pkgorder-%d" %(os.getpid(),) |
| 50 |
|
|
os.system("mkdir -p %s/var/lib/rpm" %(testpath,)) |
| 51 |
|
|
@@ -164,7 +162,12 @@ |
| 52 |
|
|
addGroups(ds, ["core", "base", "text-internet"]) |
| 53 |
|
|
|
| 54 |
|
|
# hack, hack, hack... make sure iscsi ends up on disc1 (#208832) |
| 55 |
|
|
- printMatchingPkgs("iscsi-*") |
| 56 |
|
|
+ if os.path.isdir("%s/%s/RPMS" % (toppath, product)): |
| 57 |
|
|
+ printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "iscsi-*")) |
| 58 |
|
|
+ elif os.path.isdir("%s/%s" %(toppath, product)): |
| 59 |
|
|
+ printMatchingPkgs("%s/%s/%s" % (toppath, product, "iscsi-*")) |
| 60 |
|
|
+ else: |
| 61 |
|
|
+ printMatchingPkgs("%s/%s" % (toppath, "iscsi-*")) |
| 62 |
|
|
|
| 63 |
|
|
addGroups(ds, ["base-x", "dial-up", |
| 64 |
|
|
"graphical-internet", "editors", |
| 65 |
|
|
@@ -182,17 +185,16 @@ |
| 66 |
slords |
1.1 |
"gnome-software-development", "eclipse", |
| 67 |
|
|
"x-software-development", |
| 68 |
|
|
"java-development", "kde-software-development", |
| 69 |
|
|
- "mail-server", "network-server", "legacy-network-server"]) |
| 70 |
|
|
+ "mail-server", "legacy-network-server"]) |
| 71 |
|
|
|
| 72 |
|
|
addGroups(ds, ["news-server", "legacy-software-development"]) |
| 73 |
|
|
|
| 74 |
|
|
- #Everthing else but kernels |
| 75 |
|
|
+ #Everthing else but kernels - don't depsolve |
| 76 |
|
|
for po in ds.pkgSack.returnPackages(): |
| 77 |
|
|
if po.pkgtup not in ds._installed.returnPackages(): |
| 78 |
|
|
if po.name.find("kernel") == -1: |
| 79 |
|
|
member = ds.tsInfo.addInstall(po) |
| 80 |
|
|
|
| 81 |
|
|
- ds.resolveDeps() |
| 82 |
|
|
processTransaction(ds) |
| 83 |
|
|
os.unlink(config) |
| 84 |
|
|
shutil.rmtree(testpath) |
Parent Directory
| 
Revision Log
| 
Revision Graph
