Unverified Commit ae1bb04f authored by Mattia Rizzolo's avatar Mattia Rizzolo
Browse files

reproducible debian: fix html_brekages



obviously I was sleeping when I wrote the original version...

Signed-off-by: Mattia Rizzolo's avatarMattia Rizzolo <mattia@debian.org>
parent 458d3017
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ from .confparse import (

# tested suites
SUITES = conf_distro['suites'].split()
ARCHIVED_SUITES = conf_distro.get('archived_suites', '').split()
ARCHIVED_SUITES = tuple(conf_distro.get('archived_suites', '').split())
# tested architectures
ARCHS = conf_distro['archs'].split()
# defaults
+9 −8
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import os
import csv
import time
import os.path
from sqlalchemy import text
from subprocess import check_call
from datetime import datetime, timedelta

@@ -40,9 +41,9 @@ def unrep_with_dbd_issues():
               FROM sources AS s JOIN results AS r ON r.package_id=s.id
               WHERE r.status='FTBR'
               AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
               AND s.suite NOT IN (%s)
               AND s.suite NOT IN :as
               ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
    results = query_db(query, (ARCHIVED_SUITES,))
    results = query_db(text(query), {'as': ARCHIVED_SUITES})
    for pkg, version, suite, arch in results:
        eversion = strip_epoch(version)
        dbd = DBD_PATH + '/' + suite + '/' + arch + '/' + pkg + '_' + \
@@ -79,9 +80,9 @@ def not_unrep_with_dbd_file():
               FROM sources AS s JOIN results AS r ON r.package_id=s.id
               WHERE r.status != 'FTBR'
               AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
               AND s.suite NOT IN (%s)
               AND s.suite NOT IN :as
               ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
    results = query_db(query, (ARCHIVED_SUITES,))
    results = query_db(text(query), {'as': ARCHIVED_SUITES})
    for pkg, version, suite, arch in results:
        eversion = strip_epoch(version)
        for prefix, extension in ((
@@ -106,9 +107,9 @@ def lack_rbuild():
               FROM sources AS s JOIN results AS r ON r.package_id=s.id
               WHERE r.status NOT IN ('blacklisted', '')
               AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
               AND s.suite NOT IN (%s)
               AND s.suite NOT IN :as
               ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
    results = query_db(query, (ARCHIVED_SUITES,))
    results = query_db(text(query), {'as': ARCHIVED_SUITES})
    for pkg, version, suite, arch in results:
        rbuild = os.path.join(RBUILD_PATH, suite, arch) + \
                '/{}_{}.rbuild.log.gz'.format(pkg, strip_epoch(version))
@@ -127,9 +128,9 @@ def lack_buildinfo():
               WHERE r.status NOT IN
                ('blacklisted', 'NFU', 'FTBFS', 'timeout', 'depwait', 'E404')
               AND s.distribution = (SELECT id FROM distributions WHERE name = 'debian')
               AND s.suite NOT IN (%s)
               AND s.suite NOT IN :as
               ORDER BY s.name ASC, s.suite DESC, s.architecture ASC'''
    results = query_db(query, (ARCHIVED_SUITES,))
    results = query_db(text(query), {'as': ARCHIVED_SUITES})
    for pkg, version, suite, arch in results:
        eversion = strip_epoch(version)
        buildinfo = BUILDINFO_PATH + '/' + suite + '/' + arch + '/' + pkg + \