summaryrefslogtreecommitdiff
path: root/multiarchanalyze.py
diff options
context:
space:
mode:
authorHelmut Grohne <helmut@subdivi.de>2021-12-27 13:23:44 +0100
committerHelmut Grohne <helmut@subdivi.de>2021-12-27 13:23:44 +0100
commit771220f8b805ac1521015b27c20c9cbf8ca73320 (patch)
tree1a05eab4f749d2fd00d5bb1f932fa3e662b0e401 /multiarchanalyze.py
parent245b18af76bebcda38e49f0186e7e586599f9c1d (diff)
downloaddebian-dedup-771220f8b805ac1521015b27c20c9cbf8ca73320.tar.gz
stop hiding M-A:same conflicts in binNMUed packages
The issue has been solved by Mattia Rizzolo in dh-strip-nondeterminism via #999665.
Diffstat (limited to 'multiarchanalyze.py')
-rwxr-xr-xmultiarchanalyze.py4
1 files changed, 1 insertions, 3 deletions
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("./"):