From 587c2015dcc4a66d82ec81aac9bdf7880654b8ed Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 22 Sep 2015 21:08:59 +0200 Subject: reproducible: order by suite, arch, src_name as on the filesystem --- bin/reproducible_html_breakages.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bin/reproducible_html_breakages.py b/bin/reproducible_html_breakages.py index b8d42e05..687887b1 100755 --- a/bin/reproducible_html_breakages.py +++ b/bin/reproducible_html_breakages.py @@ -18,7 +18,7 @@ def unrep_with_dbd_issues(): query = '''SELECT s.name, r.version, s.suite, s.architecture FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status="unreproducible" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' results = query_db(query) for pkg, version, suite, arch in results: eversion = strip_epoch(version) @@ -45,7 +45,7 @@ def not_unrep_with_dbd_file(): query = '''SELECT s.name, r.version, s.suite, s.architecture FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status != "unreproducible" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' results = query_db(query) for pkg, version, suite, arch in results: eversion = strip_epoch(version) @@ -64,7 +64,7 @@ def lack_rbuild(): query = '''SELECT s.name, r.version, s.suite, s.architecture FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status NOT IN ("blacklisted", "") - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' results = query_db(query) for pkg, version, suite, arch in results: if not pkg_has_rbuild(pkg, version, suite, arch): @@ -81,7 +81,7 @@ def lack_buildinfo(): FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status NOT IN ("blacklisted", "not for us", "FTBFS", "depwait", "404", "") - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' results = query_db(query) for pkg, version, suite, arch in results: eversion = strip_epoch(version) @@ -103,7 +103,7 @@ def pbuilder_dep_fail(): query = '''SELECT s.name, r.version, s.suite, s.architecture FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status = "FTBFS" AND s.suite = "testing" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' results = query_db(query) for pkg, version, suite, arch in results: eversion = strip_epoch(version) @@ -131,7 +131,7 @@ def alien_log(directory=None): FROM sources AS s JOIN results AS r ON r.package_id=s.id WHERE r.status != "" AND s.name="{pkg}" AND s.suite="{suite}" AND s.architecture="{arch}" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' bad_files = [] for root, dirs, files in os.walk(directory): if not files: @@ -158,7 +158,7 @@ def alien_buildinfo(): WHERE r.status != "" AND s.name="{pkg}" AND s.suite="{suite}" AND s.architecture="{arch}" AND r.status IN ("reproducible", "unreproducible") - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' bad_files = [] for root, dirs, files in os.walk(BUILDINFO_PATH): if not files: @@ -189,7 +189,7 @@ def alien_dbd(directory=None): FROM sources AS s JOIN results AS r on r.package_id=s.id WHERE s.name="{pkg}" AND s.suite="{suite}" AND s.architecture="{arch}" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' bad_files = [] for root, dirs, files in os.walk(directory): if not files: @@ -223,7 +223,7 @@ def alien_rbpkg(): FROM sources AS s WHERE s.name="{pkg}" AND s.suite="{suite}" AND s.architecture="{arch}" - ORDER BY s.name ASC, s.suite DESC, s.architecture ASC''' + ORDER BY s.suite DESC, s.architecture ASC, s.name ASC''' bad_files = [] for root, dirs, files in os.walk(RB_PKG_PATH): if not files: -- cgit v1.2.3-70-g09d2