X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=5bd8bf2c1359bfe96a1d775aac2f7f130fb8ec0f;hb=b7e5c9a6deda1018da9023d1d01acec86e165ba4;hp=8a49f009e5ffdff7931442c28e0182e31eb8db12;hpb=aeff0b009db845e9a924853846eff6fbb8e3f07b;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index 8a49f009..5bd8bf2c 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 @@ -561,7 +562,7 @@ def check_files(): # Check the version and for file overwrites reject(Upload.check_binary_against_db(f),"") - Binary(f, reject).scan_package( ) + Binary(f, reject).scan_package() # Checks for a source package... else: @@ -1319,7 +1320,7 @@ def is_stableupdate (): cursor.execute( """SELECT 1 FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = %(source)s - AND s.version = '%(version)s' + AND s.version = %(version)s AND sa.suite = %(suite)d""", {'source' : changes['source'], 'version' : changes['version'],