reproducible: move the really_ftbfs quering+dispalying where it should stay: in the indexes, as a section of the FTBFS pages

2 files changed, 6 insertions, 21 deletions

diff --git a/bin/reproducible_html_indexes.py b/bin/reproducible_html_indexes.py
index 7987c206..8bc6b8dd 100755
--- a/bin/reproducible_html_indexes.py
+++ b/bin/reproducible_html_indexes.py
@@ -57,6 +57,7 @@ queries = {
     'FTBFS_last24h': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "FTBFS" AND build_date > datetime("now", "-24 hours") ORDER BY build_date DESC',
     'FTBFS_last48h': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "FTBFS" AND build_date > datetime("now", "-48 hours") ORDER BY build_date DESC',
     'FTBFS_all_abc': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "FTBFS" ORDER BY name',
+    'FTBFS_not_by_us': 'SELECT s.name FROM notes AS n JOIN sources AS s ON n.package_id=s.id JOIN results AS r ON r.package_id=s.id WHERE r.status="FTBFS" and s.suite="{suite}" and s.architecture="{arch}" AND (n.issues NOT LIKE "%timestamps_from_cpp_macros%" OR n.issues NOT LIKE "%ftbfs_werror_equals%" OR n.issues NOT LIKE "%ocaml_configure_not_as_root%")',
     '404_all': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "404" ORDER BY build_date DESC',
     '404_all_abc': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "404" ORDER BY name',
     'not_for_us_all': 'SELECT s.name FROM results AS r JOIN sources AS s ON r.package_id=s.id WHERE s.suite="{suite}" AND s.architecture="{arch}" AND status = "not for us" ORDER BY build_date DESC',
@@ -93,6 +94,11 @@ pages = {
                 'icon_status': 'FTBFS',
                 'query': 'FTBFS_all',
                 'text': Template('$tot ($percent%) packages which failed to build from source in $suite/$arch:')
+            },
+            {
+                'icon_status': 'FTBFS',
+                'query': 'FTBFS_not_by_us',
+                'text': Template('$tot ($percent%) packages which really (i.e. the failure is not caused by changes we made to the toolchain) failed to build from source in $suite/$arch.\n This list exclude packages tagged <a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/$suite/timestamps_from_cpp_macros_issue.html">timestamps_from_cpp_macros</a>, <a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/$suite/ftbfs_werror_equals_issue.html">ftbfs_werror_equals</a>, or <a href="' + REPRODUCIBLE_URL + ISSUES_URI + '/$suite/ocaml_configure_not_as_root_issue.html">ocaml_configure_not_as_root</a>.'),
             }
         ]
     },
diff --git a/bin/reproducible_notes.py b/bin/reproducible_notes.py
index 16c39df6..e2b44f96 100755
--- a/bin/reproducible_notes.py
+++ b/bin/reproducible_notes.py
@@ -130,30 +130,9 @@ def store_notes():
     log.info('Saved ' + str(len(to_add)) + ' notes in the database')
 
 
-def really_ftbfs_packages():
-    query = 'SELECT s.id, s.name, s.suite, s.architecture ' + \
-            'FROM notes AS n JOIN sources AS s ON n.package_id=s.id ' + \
-            'JOIN results AS r ON r.package_id=s.id ' + \
-            'WHERE n.issues NOT LIKE "%timestamps_from_cpp_macros%" ' + \
-            'AND r.status="FTBFS"'
-    result = sorted(query_db(query), key=lambda x: x[1])
-    log.info('')
-    log.info('')
-    log.info('Following there are a list of package which FTBFS in our ' +
-             'current setup, but does not have the tag ' +
-             'timestamps_from cpp_macros, i.e. they are real FTBFS.')
-    log.info('')
-    for pkg in result:
-        log.info(pkg[1] + '\t' + REPRODUCIBLE_URL + '/' + pkg[2] + '/' +
-                 pkg[3] + '/' + pkg[1])
-    log.info('')
-    log.info('For a total of ' + str(len(result)) + ' packages')
-
-
 if __name__ == '__main__':
     notes = load_notes()
     issues = load_issues()
     store_issues()
     drop_old_issues()
     store_notes()
-    really_ftbfs_packages()