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

[Bastian Blank]

Author: waldi
Date: Sun Mar 21 12:45:22 2010
New Revision: 15440

Log:
debian/bin/buildcheck.py: Support different ignore types.

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

Modified: dists/sid/linux-2.6/debian/bin/buildcheck.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/buildcheck.py	Sun Mar 21 12:29:59 2010	(r15439)
+++ dists/sid/linux-2.6/debian/bin/buildcheck.py	Sun Mar 21 12:45:22 2010	(r15440)
@@ -53,7 +53,7 @@
 
         symbols, add, change, remove = self._cmp(ref, new)
 
-        ignore = self._ignore(symbols.keys())
+        ignore = self._ignore(symbols)
 
         add_effective = add - ignore
         change_effective = change - ignore
@@ -116,7 +116,7 @@
 
         return symbols, add, change, remove
 
-    def _ignore(self, all):
+    def _ignore(self, symbols):
         # TODO: let config merge this lists
         configs = []
         configs.append(self.config.get(('abi', self.arch, self.featureset, self.flavour), {}))
@@ -124,12 +124,20 @@
         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))
+        for ignore in ignores:
+            type = 'symbolmatch'
+            if ':' in ignore:
+                type, ignore = ignore.split(':')
+            if type == 'symbolmatch':
+                filtered.update(fnmatch.filter(symbols.iterkeys(), ignore))
+            else:
+                raise NotImplementedError
         return filtered