From 771220f8b805ac1521015b27c20c9cbf8ca73320 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Mon, 27 Dec 2021 13:23:44 +0100 Subject: stop hiding M-A:same conflicts in binNMUed packages The issue has been solved by Mattia Rizzolo in dh-strip-nondeterminism via #999665. --- multiarchanalyze.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'multiarchanalyze.py') diff --git a/multiarchanalyze.py b/multiarchanalyze.py index 132ffc6..0d209b7 100755 --- a/multiarchanalyze.py +++ b/multiarchanalyze.py @@ -93,9 +93,7 @@ def main(): db = sqlite3.connect(args.database) db.create_function("REGEXP", 2, sqlite_regexp) cur = db.cursor() - # Ignore conflicts in binNMUs as buildds don't pass --binNMU-timestamp to - # sbuild yet. See #843773. - cur.execute("SELECT name, architecture1, architecture2, filename FROM masame_conflict WHERE version NOT LIKE '%+b%';") + cur.execute("SELECT name, architecture1, architecture2, filename FROM masame_conflict;") same_conflicts = {} for package, arch1, arch2, filename in fetchiter(cur): if filename.startswith("./"): -- cgit v1.2.3