From a0bf06c658bb16117552e0575a8c7296dc9e9d21 Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Thu, 15 Jan 2015 11:38:02 +0100 Subject: reproducible: stop treating creating .buildinfo files specially (as every build creates it nowadays) --- bin/reproducible_common.py | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'bin/reproducible_common.py') diff --git a/bin/reproducible_common.py b/bin/reproducible_common.py index 887a2720..519ac56d 100755 --- a/bin/reproducible_common.py +++ b/bin/reproducible_common.py @@ -119,14 +119,9 @@ html_head_page = Template((tab*2).join(""" reproducible icon -
  • - - FTBR_with_buildinfo icon - -
  • - FTBR icon + FTBR icon
  • @@ -167,18 +162,12 @@ html_foot_page_style_note = Template((tab*2).join(""" package has a note. Visited packages are linked in green, those which have not been visited are linked in blue. """.splitlines(True))) -html_foot_page_buildinfo_note = Template((tab*2).join("""
    - A β sign after a package which is unreproducible indicates that a - .buildinfo file was generated. And that means the - - basics for building packages reproducibly are covered. -

    """.splitlines(True))) url2html = re.compile(r'((mailto\:|((ht|f)tps?)\://|file\:///){1}\S+)') -def write_html_page(title, body, destfile, noheader=False, style_note=False, buildinfo_note=False, noendpage=False): +def write_html_page(title, body, destfile, noheader=False, style_note=False, noendpage=False): now = datetime.datetime.utcnow().strftime('%Y-%m-%d %H:%M UTC') html = '' html += html_header.substitute(page_title=title) @@ -193,10 +182,7 @@ def write_html_page(title, body, destfile, noheader=False, style_note=False, bui html += body if style_note: html += html_foot_page_style_note.substitute() - if buildinfo_note: - html += html_foot_page_buildinfo_note.substitute() - else: - html += (tab*2) + '

    ' + html += (tab*2) + '

    ' if not noendpage: html += html_footer.substitute(date=now) else: @@ -216,8 +202,7 @@ def query_db(query): def join_status_icon(status, package=None, version=None): table = {'reproducible' : 'weather-clear.png', 'FTBFS': 'weather-storm.png', - 'FTBR' : 'weather-showers.png', - 'FTBR_with_buildinfo': 'weather-showers-scattered.png', + 'FTBR' : 'weather-showers-scattered.png', '404': 'weather-severe-alert.png', 'not for us': 'weather-few-clouds-night.png', 'not_for_us': 'weather-few-clouds-night.png', @@ -227,8 +212,6 @@ def join_status_icon(status, package=None, version=None): log.error('Could not determinate the real state of package None. ' + 'Returning a generic "FTBR"') status = 'FTBR' - elif pkg_has_buildinfo(package, version): - status = 'FTBR_with_buildinfo' else: status = 'FTBR' log.debug('Linking status ⇔ icon. package: ' + str(package) + ' @ ' + -- cgit v1.2.3-54-g00ecf