summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-31 19:07:36 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-31 19:07:36 +0000
commit4ea7b22f44881de14e9d5e1e4528b78752277a56 (patch)
tree26a9354bd7001f98c29f050bc5f3a0473ced6729
parentca2fff9c144d513fa66fcb59ee2f5fcb6057324c (diff)
downloadportage-4ea7b22f44881de14e9d5e1e4528b78752277a56.tar.gz
portage-4ea7b22f44881de14e9d5e1e4528b78752277a56.tar.bz2
portage-4ea7b22f44881de14e9d5e1e4528b78752277a56.zip
Ignore hidden files and directories in grablines recursion for bug #137607. This patch is from trunk r3610:3613.
svn path=/main/branches/2.1/; revision=4073
-rw-r--r--pym/portage_util.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/pym/portage_util.py b/pym/portage_util.py
index 889a82330..c3b8e5eaf 100644
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -181,10 +181,12 @@ 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.sort()
- for f in myfiles:
- mylines.extend(grablines(f, recursive))
+ dirlist = os.listdir(myfilename)
+ dirlist.sort()
+ for f in dirlist:
+ if not f.startswith("."):
+ mylines.extend(grablines(
+ os.path.join(myfilename, f), recursive))
else:
try:
myfile = open(myfilename, "r")