Attachment 309118 Details for Bug 451083 – remove repeated glob.glob calls

[patch] remove repeated glob.glob calls

pkgorder.diff (text/plain), 1.42 KB, created by Dennis Gregorovic on 2008-06-12 18:07:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Gregorovic

Created: 2008-06-12 18:07:31 UTC

Size: 1.42 KB

patch

obsolete

>--- pkgorder	2008-04-16 09:53:41.000000000 -0400
>+++ pkgorder.dg	2008-06-12 13:59:38.000000000 -0400
>@@ -9,8 +9,9 @@
> # You should have received a copy of the GNU Library Public License
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
>-import os.path
>+import fnmatch
> import glob
>+import os.path
> import rpm
> import rpmUtils
> import shutil
>@@ -89,13 +90,7 @@
> def printMatchingPkgs(fpattern):
>     global processed
> 
>-    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))
>-
>+    matches = fnmatch.filter(pkgs, fpattern)
>     for match in matches:
>         mname = os.path.basename(match)
>         if processed.has_key(mname): continue
>@@ -153,6 +148,17 @@
>     (toppath, arch, product) = args
>     config = createConfig(toppath)
> 
>+    pkg_hash = {}
>+    for dir in ("%s/%s/RPMS" % (toppath, product),
>+                "%s/%s" %(toppath, product),
>+                toppath):
>+        if os.path.isdir(dir):
>+            for x in os.listdir(dir):
>+                pkg_hash[x] = 1
>+            break
>+    pkgs = pkg_hash.keys()
>+    pkgs.sort()
>+
>     # Boo.
>     if arch == "i386":
>         arch = "i686"

Actions: View | Diff

Attachments on bug 451083: 309118