X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=856c1dfa190283488ae138209c20421f71079317;hb=1e5659500391bce37a28870ef7bce5c59eba68c7;hp=fafff7baff5060436c87a155a6456ede46a5e642;hpb=77bd8c2de837c0deb2255e12130712b4662a03f9;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index fafff7ba..856c1dfa 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -34,23 +34,14 @@ Checks Debian packages from Incoming ################################################################################ -import commands import errno import fcntl import os -import re -import shutil -import stat import sys -import time import traceback -import tarfile -import apt_inst import apt_pkg -from debian_bundle import deb822 from daklib.dbconn import * -from daklib.binary import Binary from daklib import daklog from daklib.queue import * from daklib import utils @@ -224,7 +215,10 @@ def package_to_suite(u, suite): q = q.join(DBSource).filter_by(source=u.pkg.changes['source']) q = q.filter_by(version=u.pkg.changes['version']).limit(1) - if q.count() < 1: + # NB: Careful, this logic isn't what you would think it is + # Source is already in {old-,}proposed-updates so no need to hold + # Instead, we don't move to the holding area, we just do an ACCEPT + if q.count() > 0: ret = False s.close()