X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=aa38a0032c5de584e63ff9a56b22236ca295b35e;hb=870993b63b9296e3ea1f8b03099657cbab8c99e0;hp=07e3c22abc0514f179d8c6cf854639fc4dadd85b;hpb=d44faefd78782178bddbaf494c0aa453114f460a;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 07e3c22a..aa38a003 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -389,7 +389,8 @@ def check_files(): cursor = DBConn().cursor() # Check for packages that have moved from one component to another # STU: this should probably be changed to not join on architecture, suite tables but instead to used their cached name->id mappings from DBConn - cursor.execute("""PREPARE moved_pkg_q(text,text,text) AS + DBConn().prepare("moved_pkg_q", """ + PREPARE moved_pkg_q(text,text,text) AS SELECT c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f WHERE b.package = $1 AND s.suite_name = $2 @@ -1323,7 +1324,7 @@ def is_stableupdate (): AND sa.suite = %(suite)d""", {'source' : changes['source'], 'version' : changes['version'], - 'suite' : pasuite}) + 'suite' : pusuite}) if cursor.fetchone(): # source is already in proposed-updates so no need to hold @@ -1358,7 +1359,7 @@ def is_oldstableupdate (): AND sa.suite = %d""", {'source' : changes['source'], 'version' : changes['version'], - 'suite' : pasuite}) + 'suite' : pusuite}) if cursor.fetchone(): return 0