From e3afc0557a838f3f1e0d211bc529440176fe74df Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 6 Nov 2006 13:23:55 +0000 Subject: [PATCH] debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/lib/python/debian_linux/abi.py: Support updated version description. svn path=/dists/trunk/linux-2.6/; revision=7703 --- debian/bin/abicheck.py | 2 ++ debian/bin/abiupdate.py | 4 ++-- debian/lib/python/debian_linux/abi.py | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/bin/abicheck.py b/debian/bin/abicheck.py index c88bd2d06..b024b8766 100755 --- a/debian/bin/abicheck.py +++ b/debian/bin/abicheck.py @@ -67,6 +67,8 @@ class checker(object): info.append("module: %s -> %s" % change_info[symbol]['module']) if change_info[symbol].has_key('version'): info.append("version: %s -> %s" % change_info[symbol]['version']) + if change_info[symbol].has_key('export'): + info.append("export: %s -> %s" % change_info[symbol]['export']) out.write("%-48s %s\n" % (symbol, ", ".join(info))) if remove: out.write("\nRemoved symbols:\n") diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py index aca97e41a..342cb8485 100755 --- a/debian/bin/abiupdate.py +++ b/debian/bin/abiupdate.py @@ -32,8 +32,8 @@ class main(object): changelog = changelog[0] self.source = changelog['Source'] - self.version = changelog['Version']['version'] - self.version_source = changelog['Version']['source'] + self.version = changelog['Version']['linux']['version'] + self.version_source = changelog['Version']['linux']['source'] local_config = config_reader_arch(["debian/arch"]) diff --git a/debian/lib/python/debian_linux/abi.py b/debian/lib/python/debian_linux/abi.py index 03f10ee6b..930e5d143 100644 --- a/debian/lib/python/debian_linux/abi.py +++ b/debian/lib/python/debian_linux/abi.py @@ -16,14 +16,16 @@ class symbols(object): symbols_add[symbol] = {'module': new.symbols[symbol][0]} for symbol in symbols_ref.intersection(symbols_new): - module_ref, version_ref = self.symbols[symbol] - module_new, version_new = new.symbols[symbol] + module_ref, version_ref, export_ref = self.symbols[symbol] + module_new, version_new, export_new = new.symbols[symbol] ent = {} if module_ref != module_new: ent['module'] = module_ref, module_new if version_ref != version_new: ent['version'] = version_ref, version_new + if export_ref != export_new: + ent['export'] = export_ref, export_new if ent: symbols_change[symbol] = ent