[kernel] r12212 - dists/sid/linux-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Tue Sep  9 17:56:48 2008
New Revision: 12212

Log:
debian/bin/abicheck.py
- Merge all ignores.
- Support ignore pattern.


Modified:
   dists/sid/linux-2.6/debian/bin/abicheck.py

Modified: dists/sid/linux-2.6/debian/bin/abicheck.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/abicheck.py	(original)
+++ dists/sid/linux-2.6/debian/bin/abicheck.py	Tue Sep  9 17:56:48 2008
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import fnmatch
 import sys
 sys.path.append('debian/lib/python')
 
@@ -91,11 +92,21 @@
         return ret
 
     def _ignore(self, add, change, remove):
-        config = self.config.merge('abi', self.arch, self.featureset, self.flavour)
-        ignores = set(config.get('ignore-changes', []))
-        if '*' in ignores:
-            return set(add.keys() + change.keys() + remove.keys())
-        return ignores
+        all = set(add.keys() + change.keys() + remove.keys())
+        # TODO: let config merge this lists
+        configs = []
+        configs.append(self.config.get(('abi', self.arch, self.featureset, self.flavour), {}))
+        configs.append(self.config.get(('abi', self.arch, None, self.flavour), {}))
+        configs.append(self.config.get(('abi', self.arch, self.featureset), {}))
+        configs.append(self.config.get(('abi', self.arch), {}))
+        configs.append(self.config.get(('abi',), {}))
+        ignores = set()
+        for config in configs:
+            ignores.update(config.get('ignore-changes', []))
+        filtered = set()
+        for m in ignores:
+            filtered.update(fnmatch.filter(all, m))
+        return filtered
 
 if __name__ == '__main__':
     sys.exit(checker(*sys.argv[1:])(sys.stdout))