Attachment 148972 Details for Bug 230487 – Patch for correct path handling

[patch] Patch for correct path handling

anaconda-11.1.2.16-pkgorder.patch (text/plain), 2.14 KB, created by Jos Vos on 2007-02-28 23:16:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jos Vos

Created: 2007-02-28 23:16:50 UTC

Size: 2.14 KB

patch

obsolete

>--- anaconda-11.1.2.16/scripts/pkgorder.orig	2006-10-17 21:13:53.000000000 +0200
>+++ anaconda-11.1.2.16/scripts/pkgorder	2007-03-01 00:03:05.000000000 +0100
>@@ -76,13 +76,17 @@
> #    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)
>+        printMatchingPkgs("%s*" % (fname.rsplit('.', 2)[0],))
> 
> def printMatchingPkgs(fpattern):
>     global processed
> 
>-    matches = glob.glob(fpattern)
>+    if os.path.isdir("%s/%s/RPMS" % (toppath, product)):
>+        matches = glob.glob("%s/%s/RPMS/%s" % (toppath, product, fpattern))
>+    elif os.path.isdir("%s/%s" %(toppath, product)):
>+        matches = glob.glob("%s/%s/%s" % (toppath, product, fpattern))
>+    else:
>+        matches = glob.glob("%s/%s" % (toppath, fpattern))        
> 
>     for match in matches:
>         mname = os.path.basename(match)
>@@ -146,12 +150,7 @@
>         arch = "i686"
> 
>     # print out kernel related packages first
>-    if os.path.isdir("%s/%s/RPMS" % (toppath, product)):
>-        printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "kernel-*"))
>-    elif os.path.isdir("%s/%s" %(toppath, product)):
>-        printMatchingPkgs("%s/%s/%s" % (toppath, product, "kernel-*"))
>-    else:
>-        printMatchingPkgs("%s/%s" % (toppath, "kernel-*"))        
>+    printMatchingPkgs("kernel-*")
> 
>     testpath = "/tmp/pkgorder-%d" %(os.getpid(),)
>     os.system("mkdir -p %s/var/lib/rpm" %(testpath,))
>@@ -162,12 +161,7 @@
>     addGroups(ds, ["core", "base", "text-internet"])
> 
>     # hack, hack, hack... make sure iscsi ends up on disc1 (#208832)
>-    if os.path.isdir("%s/%s/RPMS" % (toppath, product)):
>-        printMatchingPkgs("%s/%s/RPMS/%s" % (toppath, product, "iscsi-*"))
>-    elif os.path.isdir("%s/%s" %(toppath, product)):
>-        printMatchingPkgs("%s/%s/%s" % (toppath, product, "iscsi-*"))
>-    else:
>-        printMatchingPkgs("%s/%s" % (toppath, "iscsi-*"))        
>+    printMatchingPkgs("iscsi-*")
> 
>     addGroups(ds, ["base-x", "dial-up",
>                    "graphical-internet", "editors",

Actions: View | Diff

Attachments on bug 230487: 148972