Test the basename for starting with "." instead of the full path.
authorZac Medico <zmedico@gentoo.org>
Fri, 23 Jun 2006 03:41:07 +0000 (03:41 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 23 Jun 2006 03:41:07 +0000 (03:41 -0000)
svn path=/main/trunk/; revision=3613

pym/portage_util.py

index 337085ac30a866ccb66a2bbb6efd1e024a6b3016..798937b63fd38dd5a40a626460feb4dd49756584 100644 (file)
@@ -182,11 +182,10 @@ def grabfile_package(myfilename, compatlevel=0, recursive=0):
 def grablines(myfilename,recursive=0):
        mylines=[]
        if recursive and os.path.isdir(myfilename):
-               myfiles = [myfilename+os.path.sep+x for x in os.listdir(myfilename)]
-               myfiles = [f for f in myfiles if not f.startswith(".")]
-               myfiles.sort()
-               for f in myfiles:
-                       mylines.extend(grablines(f, recursive))
+               for f in os.listdir(myfilename):
+                       if not f.startswith("."):
+                               mylines.extend(grablines(
+                                       os.path.join(myfilename, f), recursive))
        else:
                try:
                        myfile = open(myfilename, "r")