debian/bin/abicheck.py, debian/lib/python/debian_linux/abi.py:

Remove own type of abi files.

svn path=/dists/trunk/linux-2.6/; revision=6994

2 files changed, 3 insertions, 18 deletions

diff --git a/debian/bin/abicheck.py b/debian/bin/abicheck.py
index 5cdf0cddb5bd..c88bd2d069b1 100755
--- a/debian/bin/abicheck.py
+++ b/debian/bin/abicheck.py
@@ -17,8 +17,7 @@ class checker(object):
     def __call__(self, out):
         ret = 0
 
-        new = symbols()
-        new.read_kernel(file(self.filename_new))
+        new = symbols(self.filename_new)
         try:
             ref = symbols(self.filename_ref)
         except IOError:
diff --git a/debian/lib/python/debian_linux/abi.py b/debian/lib/python/debian_linux/abi.py
index 7a0861c3947f..188246f4f351 100644
--- a/debian/lib/python/debian_linux/abi.py
+++ b/debian/lib/python/debian_linux/abi.py
@@ -37,21 +37,7 @@ class symbols(object):
         self.symbols = {}
 
         for line in file.readlines():
-            symbol, module, version = line.strip().split()
-
-            symbols = self.modules.get(module, {})
-            symbols[symbol] = version
-            self.modules[module] = symbols
-            if self.symbols.has_key(symbol):
-                pass
-            self.symbols[symbol] = module, version
-
-    def read_kernel(self, file):
-        self.modules = {}
-        self.symbols = {}
-
-        for line in file.readlines():
-            version, symbol, module = line.strip().split('\t')
+            version, symbol, module = line.strip().split()
 
             symbols = self.modules.get(module, {})
             symbols[symbol] = version
@@ -65,7 +51,7 @@ class symbols(object):
         symbols.sort()
         for symbol, i in symbols:
             module, version = i
-            file.write("%s %s %s\n" % (symbol, module, version))
+            file.write("%s %s %s\n" % (version, symbol, module))
 
     def write_human(self, file):
         modules = self.modules.keys()