diff options
| -rwxr-xr-x | multiarchanalyze.py | 4 | ||||
| -rw-r--r-- | multiarchanalyze.sql | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/multiarchanalyze.py b/multiarchanalyze.py index b12fc79..a238dd4 100755 --- a/multiarchanalyze.py +++ b/multiarchanalyze.py @@ -93,7 +93,9 @@ def main(): db = sqlite3.connect(args.database) db.create_function("REGEXP", 2, sqlite_regexp) cur = db.cursor() - cur.execute("SELECT name1, architecture1, architecture2, filename FROM masame_conflict;") + # Ignore conflicts in binNMUs as buildds don't pass --binNMU-timestamp to + # sbuild yet. See #843773. + cur.execute("SELECT name, version, architecture1, architecture2, filename FROM masame_conflict WHERE version NOT LIKE '%+b%';") same_conflicts = {} for package, arch1, arch2, filename in fetchiter(cur): if filename.startswith("./"): diff --git a/multiarchanalyze.sql b/multiarchanalyze.sql index 5a7d403..48e95c9 100644 --- a/multiarchanalyze.sql +++ b/multiarchanalyze.sql @@ -109,7 +109,7 @@ CREATE VIEW indeppackage AS /* Packages violating M-A:same by shipping conflicting files. */ DROP VIEW IF EXISTS masame_conflict; CREATE VIEW masame_conflict AS - SELECT name1, architecture1, architecture2, filename + SELECT name1 AS name, version1 AS version, architecture1, architecture2, filename FROM contentconflict WHERE name1 = name2 AND version1 = version2 |