From 7a54cc60ba9fb2c1d018e7eed61fe6cbe0c055e4 Mon Sep 17 00:00:00 2001 From: Noah Meyerhans Date: Fri, 27 Mar 2020 10:08:13 -0700 Subject: Cope with change to Module.symvers file structure With commit 7b727f1c5394 ("modpost: move the namespace field in Module.symvers last"), upstream has re-ordered the content of Module.symvers. Update our tooling to cope with the new input format, and to preserve the new format in output. --- debian/lib/python/debian_linux/abi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/lib/python/debian_linux/abi.py b/debian/lib/python/debian_linux/abi.py index c3ca9704045c..8c108b6fdfbf 100644 --- a/debian/lib/python/debian_linux/abi.py +++ b/debian/lib/python/debian_linux/abi.py @@ -35,10 +35,10 @@ class Symbols(dict): def read(self, file): for line in file: - version, name, namespace, module, export = line.strip().split('\t') + version, name, module, export, namespace = line.strip('\r\n').split('\t') self[name] = Symbol(name, namespace, module, version, export) def write(self, file): for s in sorted(self.values(), key=lambda i: i.name): file.write("%s\t%s\t%s\t%s\t%s\n" % - (s.version, s.name, s.namespace, s.module, s.export)) + (s.version, s.name, s.module, s.export, s.namespace)) -- cgit v1.2.3