From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 9 Oct 2007 19:09:00 +0000 (-0000)
Subject:    Merged from trunk 8020:8021
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=95c157764dd7615ba9ad8552914d9a0e14ce137e;p=portage.git

   Merged from trunk 8020:8021

   | 8021   | Exclude .metadata files in multi set configurations for       |
   | genone | StaticFileSet                                                 |

svn path=/main/branches/prefix/; revision=8023
---

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 889e7f973..61ab1bc53 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -79,6 +79,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))