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 9cf90600a500802df87161279a323d8843fc02bf..c13c37252996d5ab23581c825c898fda31041359 100644 (file)
--- 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 889e7f973519a4d906e3bd39d86df899648af0d8..61ab1bc5303d54ae183dd6937fc4603dede3de74 100644 (file)
--- 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))