summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 7dd7d22ef..08accebd4 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5791,7 +5791,8 @@ class portagetree:
class dbapi:
- _category_re = re.compile(r'^[+\w][-\.+\w]*$')
+ _category_re = re.compile(r'^\w[-.+\w]*$')
+ _pkg_dir_name_re = re.compile(r'^\w[-+\w]*$')
def __init__(self):
pass
@@ -7163,6 +7164,9 @@ class portdbapi(dbapi):
self._non_category_dirs.match(x):
continue
for y in listdir(oroot+"/"+x, EmptyOnError=1, ignorecvs=1, dirsonly=1):
+ if not self._pkg_dir_name_re.match(y) or \
+ y == "CVS":
+ continue
d[x+"/"+y] = None
l = d.keys()
l.sort()