summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2007-10-09 18:55:33 +0000
committerMarius Mauch <genone@gentoo.org>2007-10-09 18:55:33 +0000
commitc1b09c5ce53335bb79f2bccd5ae4a1ff090853ff (patch)
treefe5f2a76d8829409007c599bab4c8dd809d00024
parent16832f91ddc9f55bb98628d38b81720688f0b90c (diff)
downloadportage-c1b09c5ce53335bb79f2bccd5ae4a1ff090853ff.tar.gz
portage-c1b09c5ce53335bb79f2bccd5ae4a1ff090853ff.tar.bz2
portage-c1b09c5ce53335bb79f2bccd5ae4a1ff090853ff.zip
Exclude .metadata files in multi set configurations for StaticFileSet
svn path=/main/trunk/; revision=8021
-rw-r--r--pym/portage/sets/__init__.py1
-rw-r--r--pym/portage/sets/files.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 9cf90600a..c13c37252 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -179,6 +179,7 @@ class SetConfig(SafeConfigParser):
self.trees = trees
self.settings = settings
self._parsed = False
+
def _parse(self):
if self._parsed:
return
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index c6656397e..d402a912e 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -80,6 +80,8 @@ class StaticFileSet(EditablePackageSet):
raise SetConfigError("name_pattern doesn't include $name placeholder")
if os.path.isdir(directory):
for filename in os.listdir(directory):
+ if filename.endswith(".metadata"):
+ continue
myname = name_pattern.replace("$name", filename)
myname = myname.replace("${name}", filename)
rValue[myname] = StaticFileSet(os.path.join(directory, filename))