From cabe09b4d162c7f680b07863cc043359545dabdd Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Mon, 26 Aug 2002 18:07:24 +0000 Subject: [PATCH] * katie.py (in_override_p): when searching for a source override, and the dsc query misses, search for both udeb and deb overrides as well. Should fix the UNACCEPT issues with udebs. --- katie.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/katie.py b/katie.py index 8c31a2dd..2614462d 100644 --- a/katie.py +++ b/katie.py @@ -2,7 +2,7 @@ # Utility functions for katie # Copyright (C) 2001, 2002 James Troup -# $Id: katie.py,v 1.25 2002-07-12 14:59:08 troup Exp $ +# $Id: katie.py,v 1.26 2002-08-26 18:07:24 ajt Exp $ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -654,9 +654,10 @@ distribution."""; result = q.getresult(); # If checking for a source package fall back on the binary override type if type == "dsc" and not result: - type_id = db_access.get_override_type_id("deb"); - q = self.projectB.query("SELECT s.section, p.priority FROM override o, section s, priority p WHERE package = '%s' AND suite = %s AND component = %s AND type = %s AND o.section = s.id AND o.priority = p.id" - % (package, suite_id, component_id, type_id)); + deb_type_id = db_access.get_override_type_id("deb"); + udeb_type_id = db_access.get_override_type_id("udeb"); + q = self.projectB.query("SELECT s.section, p.priority FROM override o, section s, priority p WHERE package = '%s' AND suite = %s AND component = %s AND (type = %s OR type = %s) AND o.section = s.id AND o.priority = p.id" + % (package, suite_id, component_id, deb_type_id, udeb_type_id)); result = q.getresult(); # Remember the section and priority so we can check them later if appropriate -- 2.39.5