From f6d219e1a4fddc0abb11b2235866d072789d1a13 Mon Sep 17 00:00:00 2001 From: Helmut Grohne Date: Thu, 8 Oct 2020 22:13:57 +0200 Subject: add build architecture to schema of depcheck table --- webapp.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'webapp.py') diff --git a/webapp.py b/webapp.py index 8cdd43a..5d75ba6 100644 --- a/webapp.py +++ b/webapp.py @@ -383,9 +383,7 @@ def show_index(): def show_source(source): context = dict(sourcepackage=source) with db.engine.connect() as conn: - query = sqlalchemy.text("""SELECT 'amd64' AS buildarch, - architecture AS hostarch - FROM depcheck;""") + query = sqlalchemy.text("SELECT buildarch, hostarch FROM depcheck;") context["architectures"] = set(map(tuple, conn.execute(query))) context["version"], context["depresult"] = collect_depstate(conn, source) @@ -428,8 +426,6 @@ def request_schedule(): raise werkzeug.exceptions.BadRequest() if buildarch == "any": buildarch = None - elif buildarch != "amd64": - raise werkzeug.exceptions.BadRequest() with db.engine.connect() as conn: query = sqlalchemy.text(""" SELECT 1 FROM depstate WHERE source = :source;""") @@ -439,8 +435,10 @@ def request_schedule(): hostarch = None else: query = sqlalchemy.text(""" - SELECT 1 FROM depcheck WHERE architecture = :hostarch;""") - if not conn.execute(query, hostarch=hostarch).first(): + SELECT 1 FROM depcheck + WHERE buildarch = :buildarch AND hostarch = :hostarch;""") + if not conn.execute(query, buildarch=buildarch, + hostarch=hostarch).first(): raise werkzeug.exceptions.BadRequest() query = sqlalchemy.text(""" INSERT INTO buildrequests (source, buildarch, hostarch, -- cgit v1.2.3