X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=ca61ee3e3a4c5e2a806d354742c92cb554b4d09f;hb=1c35448b880358d020e81339657e3435fdda9434;hp=9acdcdd90d5fc06679ea877c8a91865a3587a10a;hpb=7e3643744124f575a9d7ba1e978f0d7ad05764d1;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 9acdcdd9..ca61ee3e 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1,7 +1,13 @@
 #!/usr/bin/env python
 
-# Checks Debian packages from Incoming
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
+"""
+Checks Debian packages from Incoming
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2000, 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
+@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@copyright: 2009  Mark Hymers <mhy@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 
 # 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
@@ -28,77 +34,77 @@
 
 ################################################################################
 
-import commands, errno, fcntl, os, re, shutil, stat, sys, time, tempfile, traceback
-import apt_inst, apt_pkg
-from daklib import database
-from daklib import logging
-from daklib import queue
+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
+from daklib.textutils import fix_maintainer
 from daklib.dak_exceptions import *
+from daklib.regexes import re_default_answer
+from daklib.summarystats import SummaryStats
+from daklib.holding import Holding
+from daklib.config import Config
 
 from types import *
 
 ################################################################################
 
-re_valid_version = re.compile(r"^([0-9]+:)?[0-9A-Za-z\.\-\+:~]+$")
-re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$")
-re_changelog_versions = re.compile(r"^\w[-+0-9a-z.]+ \([^\(\) \t]+\)")
-re_strip_revision = re.compile(r"-([^-]+)$")
-re_strip_srcver = re.compile(r"\s+\(\S+\)$")
-re_spacestrip = re.compile('(\s)')
 
 ################################################################################
 
 # Globals
-Cnf = None
 Options = None
 Logger = None
-Upload = None
-
-reprocess = 0
-in_holding = {}
-
-# Aliases to the real vars in the Upload class; hysterical raisins.
-reject_message = ""
-changes = {}
-dsc = {}
-dsc_files = {}
-files = {}
-pkg = {}
 
 ###############################################################################
 
 def init():
-    global Cnf, Options, Upload, changes, dsc, dsc_files, files, pkg
+    global Options
 
     apt_pkg.init()
-
-    Cnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file())
+    cnf = Config()
 
     Arguments = [('a',"automatic","Dinstall::Options::Automatic"),
                  ('h',"help","Dinstall::Options::Help"),
                  ('n',"no-action","Dinstall::Options::No-Action"),
                  ('p',"no-lock", "Dinstall::Options::No-Lock"),
-                 ('s',"no-mail", "Dinstall::Options::No-Mail")]
+                 ('s',"no-mail", "Dinstall::Options::No-Mail"),
+                 ('d',"directory", "Dinstall::Options::Directory", "HasArg")]
 
     for i in ["automatic", "help", "no-action", "no-lock", "no-mail",
-              "override-distribution", "version"]:
-        Cnf["Dinstall::Options::%s" % (i)] = ""
+              "override-distribution", "version", "directory"]:
+        cnf["Dinstall::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    Options = Cnf.SubTree("Dinstall::Options")
+    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.SubTree("Dinstall::Options")
 
     if Options["Help"]:
         usage()
 
-    Upload = queue.Upload(Cnf)
+    # If we have a directory flag, use it to find our files
+    if cnf["Dinstall::Options::Directory"] != "":
+        # Note that we clobber the list of files we were given in this case
+        # so warn if the user has done both
+        if len(changes_files) > 0:
+            utils.warn("Directory provided so ignoring files given on command line")
 
-    changes = Upload.pkg.changes
-    dsc = Upload.pkg.dsc
-    dsc_files = Upload.pkg.dsc_files
-    files = Upload.pkg.files
-    pkg = Upload.pkg
+        changes_files = utils.get_changes_files(cnf["Dinstall::Options::Directory"])
 
     return changes_files
 
@@ -188,6 +194,9 @@ def check_changes():
     except ParseChangesError, line:
         reject("%s: parse error, can't grok: %s." % (filename, line))
         return 0
+    except ChangesUnicodeError:
+        reject("%s: changes file not proper utf-8" % (filename))
+        return 0
 
     # Parse the Files field from the .changes into another dictionary
     try:
@@ -246,13 +255,13 @@ def check_changes():
     # Ensure all the values in Closes: are numbers
     if changes.has_key("closes"):
         for i in changes["closes"].keys():
-            if queue.re_isanum.match (i) == None:
+            if re_isanum.match (i) == None:
                 reject("%s: `%s' from Closes field isn't a number." % (filename, i))
 
 
     # chopversion = no epoch; chopversion2 = no epoch and no revision (e.g. for .orig.tar.gz comparison)
-    changes["chopversion"] = utils.re_no_epoch.sub('', changes["version"])
-    changes["chopversion2"] = utils.re_no_revision.sub('', changes["chopversion"])
+    changes["chopversion"] = re_no_epoch.sub('', changes["version"])
+    changes["chopversion2"] = re_no_revision.sub('', changes["chopversion"])
 
     # Check there isn't already a changes file of the same name in one
     # of the queue directories.
@@ -291,7 +300,7 @@ def check_distributions():
             (source, dest) = args[1:3]
             if changes["distribution"].has_key(source):
                 for arch in changes["architecture"].keys():
-                    if arch not in Cnf.ValueList("Suite::%s::Architectures" % (source)):
+                    if arch not in DBConn().get_suite_architectures(source):
                         reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"")
                         del changes["distribution"][source]
                         changes["distribution"][dest] = 1
@@ -324,31 +333,6 @@ def check_distributions():
 
 ################################################################################
 
-def check_deb_ar(filename):
-    """Sanity check the ar of a .deb, i.e. that there is:
-
- o debian-binary
- o control.tar.gz
- o data.tar.gz or data.tar.bz2
-
-in that order, and nothing else."""
-    cmd = "ar t %s" % (filename)
-    (result, output) = commands.getstatusoutput(cmd)
-    if result != 0:
-        reject("%s: 'ar t' invocation failed." % (filename))
-        reject(utils.prefix_multi_line_string(output, " [ar output:] "), "")
-    chunks = output.split('\n')
-    if len(chunks) != 3:
-        reject("%s: found %d chunks, expected 3." % (filename, len(chunks)))
-    if chunks[0] != "debian-binary":
-        reject("%s: first chunk is '%s', expected 'debian-binary'." % (filename, chunks[0]))
-    if chunks[1] != "control.tar.gz":
-        reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (filename, chunks[1]))
-    if chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]:
-        reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (filename, chunks[2]))
-
-################################################################################
-
 def check_files():
     global reprocess
 
@@ -387,13 +371,27 @@ def check_files():
     has_binaries = 0
     has_source = 0
 
+    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
+    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
+          AND (a.arch_string = $3 OR a.arch_string = 'all')
+          AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id
+          AND f.location = l.id
+          AND l.component = c.id
+          AND b.file = f.id""")
+
     for f in file_keys:
         # Ensure the file does not already exist in one of the accepted directories
         for d in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]:
             if not Cnf.has_key("Dir::Queue::%s" % (d)): continue
             if os.path.exists(Cnf["Dir::Queue::%s" % (d) ] + '/' + f):
                 reject("%s file already exists in the %s directory." % (f, d))
-        if not utils.re_taint_free.match(f):
+        if not re_taint_free.match(f):
             reject("!!WARNING!! tainted filename: '%s'." % (f))
         # Check the file is readable
         if os.access(f, os.R_OK) == 0:
@@ -411,7 +409,7 @@ def check_files():
             files[f]["byhand"] = 1
             files[f]["type"] = "byhand"
         # Checks for a binary package...
-        elif utils.re_isadeb.match(f):
+        elif re_isadeb.match(f):
             has_binaries = 1
             files[f]["type"] = "deb"
 
@@ -424,6 +422,15 @@ def check_files():
                 deb_file.close()
                 # Can't continue, none of the checks on control would work.
                 continue
+
+            # Check for mandantory "Description:"
+            deb_file.seek ( 0 )
+            try:
+                apt_pkg.ParseSection(apt_inst.debExtractControl(deb_file))["Description"] + '\n'
+            except:
+                reject("%s: Missing Description in binary package" % (f))
+                continue
+
             deb_file.close()
 
             # Check for mandatory fields
@@ -451,7 +458,7 @@ def check_files():
             default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable")
             architecture = control.Find("Architecture")
             upload_suite = changes["distribution"].keys()[0]
-            if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)) and architecture not in Cnf.ValueList("Suite::%s::Architectures" % (upload_suite)):
+            if architecture not in DBConn().get_suite_architectures(default_suite) and architecture not in DBConn().get_suite_architectures(upload_suite):
                 reject("Unknown architecture '%s'." % (architecture))
 
             # Ensure the architecture of the .deb is one of the ones
@@ -497,7 +504,7 @@ def check_files():
             source = files[f]["source"]
             source_version = ""
             if source.find("(") != -1:
-                m = utils.re_extract_src_version.match(source)
+                m = re_extract_src_version.match(source)
                 source = m.group(1)
                 source_version = m.group(2)
             if not source_version:
@@ -506,12 +513,12 @@ def check_files():
             files[f]["source version"] = source_version
 
             # Ensure the filename matches the contents of the .deb
-            m = utils.re_isadeb.match(f)
+            m = re_isadeb.match(f)
             #  package name
             file_package = m.group(1)
             if files[f]["package"] != file_package:
                 reject("%s: package part of filename (%s) does not match package name in the %s (%s)." % (f, file_package, files[f]["dbtype"], files[f]["package"]))
-            epochless_version = utils.re_no_epoch.sub('', control.Find("Version"))
+            epochless_version = re_no_epoch.sub('', control.Find("Version"))
             #  version
             file_version = m.group(2)
             if epochless_version != file_version:
@@ -531,7 +538,7 @@ def check_files():
                 # Check in the SQL database
                 if not Upload.source_exists(source_package, source_version, changes["distribution"].keys()):
                     # Check in one of the other directories
-                    source_epochless_version = utils.re_no_epoch.sub('', source_version)
+                    source_epochless_version = re_no_epoch.sub('', source_version)
                     dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
                     if os.path.exists(Cnf["Dir::Queue::Byhand"] + '/' + dsc_filename):
                         files[f]["byhand"] = 1
@@ -549,11 +556,11 @@ def check_files():
             # Check the version and for file overwrites
             reject(Upload.check_binary_against_db(f),"")
 
-            check_deb_ar(f)
+            Binary(f, reject).scan_package()
 
         # Checks for a source package...
         else:
-            m = utils.re_issource.match(f)
+            m = re_issource.match(f)
             if m:
                 has_source = 1
                 files[f]["package"] = m.group(1)
@@ -609,7 +616,7 @@ def check_files():
 
             # Validate the component
             component = files[f]["component"]
-            component_id = database.get_component_id(component)
+            component_id = DBConn().get_component_id(component)
             if component_id == -1:
                 reject("file '%s' has unknown component '%s'." % (f, component))
                 continue
@@ -624,14 +631,14 @@ def check_files():
 
             # Determine the location
             location = Cnf["Dir::Pool"]
-            location_id = database.get_location_id (location, component, archive)
+            location_id = DBConn().get_location_id(location, component, archive)
             if location_id == -1:
                 reject("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (component, archive))
             files[f]["location id"] = location_id
 
             # Check the md5sum & size against existing files (if any)
             files[f]["pool name"] = utils.poolify (changes["source"], files[f]["component"])
-            files_id = database.get_files_id(files[f]["pool name"] + f, files[f]["size"], files[f]["md5sum"], files[f]["location id"])
+            files_id = DBConn().get_files_id(files[f]["pool name"] + f, files[f]["size"], files[f]["md5sum"], files[f]["location id"])
             if files_id == -1:
                 reject("INTERNAL ERROR, get_files_id() returned multiple matches for %s." % (f))
             elif files_id == -2:
@@ -639,16 +646,9 @@ def check_files():
             files[f]["files id"] = files_id
 
             # Check for packages that have moved from one component to another
-            q = Upload.projectB.query("""
-SELECT c.name FROM binaries b, bin_associations ba, suite s, location l,
-                   component c, architecture a, files f
- WHERE b.package = '%s' AND s.suite_name = '%s'
-   AND (a.arch_string = '%s' OR a.arch_string = 'all')
-   AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id
-   AND f.location = l.id AND l.component = c.id AND b.file = f.id"""
-                               % (files[f]["package"], suite,
-                                  files[f]["architecture"]))
-            ql = q.getresult()
+            files[f]['suite'] = suite
+            cursor.execute("""EXECUTE moved_pkg_q( %(package)s, %(suite)s, %(architecture)s )""", ( files[f] ) )
+            ql = cursor.fetchone()
             if ql:
                 files[f]["othercomponents"] = ql[0][0]
 
@@ -695,6 +695,9 @@ def check_dsc():
         reject("%s: parse error, can't grok: %s." % (dsc_filename, line))
     except InvalidDscError, line:
         reject("%s: syntax error on line %s." % (dsc_filename, line))
+    except ChangesUnicodeError:
+        reject("%s: dsc file not proper utf-8." % (dsc_filename))
+
     # Build up the file list of files mentioned by the .dsc
     try:
         dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1))
@@ -748,7 +751,7 @@ def check_dsc():
                 pass
 
     # Ensure the version number in the .dsc matches the version number in the .changes
-    epochless_dsc_version = utils.re_no_epoch.sub('', dsc["version"])
+    epochless_dsc_version = re_no_epoch.sub('', dsc["version"])
     changes_version = files[dsc_filename]["version"]
     if epochless_dsc_version != files[dsc_filename]["version"]:
         reject("version ('%s') in .dsc does not match version ('%s') in .changes." % (epochless_dsc_version, changes_version))
@@ -756,7 +759,7 @@ def check_dsc():
     # Ensure there is a .tar.gz in the .dsc file
     has_tar = 0
     for f in dsc_files.keys():
-        m = utils.re_issource.match(f)
+        m = re_issource.match(f)
         if not m:
             reject("%s: %s in Files field not recognised as source." % (dsc_filename, f))
             continue
@@ -806,7 +809,7 @@ def get_changelog_versions(source_dir):
 
     # Create a symlink mirror of the source files in our temporary directory
     for f in files.keys():
-        m = utils.re_issource.match(f)
+        m = re_issource.match(f)
         if m:
             src = os.path.join(source_dir, f)
             # If a file is missing for whatever reason, give up.
@@ -836,7 +839,7 @@ def get_changelog_versions(source_dir):
         return
 
     # Get the upstream version
-    upstr_version = utils.re_no_epoch.sub('', dsc["version"])
+    upstr_version = re_no_epoch.sub('', dsc["version"])
     if re_strip_revision.search(upstr_version):
         upstr_version = re_strip_revision.sub('', upstr_version)
 
@@ -870,13 +873,7 @@ def check_source():
        or pkg.orig_tar_gz == -1:
         return
 
-    # Create a temporary directory to extract the source into
-    if Options["No-Action"]:
-        tmpdir = tempfile.mkdtemp()
-    else:
-        # We're in queue/holding and can create a random directory.
-        tmpdir = "%s" % (os.getpid())
-        os.mkdir(tmpdir)
+    tmpdir = utils.temp_dirname()
 
     # Move into the temporary directory
     cwd = os.getcwd()
@@ -912,7 +909,8 @@ def check_urgency ():
     if changes["architecture"].has_key("source"):
         if not changes.has_key("urgency"):
             changes["urgency"] = Cnf["Urgency::Default"]
-        changes["urgency"] = changes["urgency"].lower()
+        # Urgency may be followed by space & comment (policy 5.6.17)
+        changes["urgency"] = changes["urgency"].split(" ")[0].lower();
         if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"):
             reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ")
             changes["urgency"] = Cnf["Urgency::Default"]
@@ -997,12 +995,21 @@ def check_timestamps():
 ################################################################################
 
 def lookup_uid_from_fingerprint(fpr):
-    q = Upload.projectB.query("SELECT u.uid, u.name, k.debian_maintainer FROM fingerprint f JOIN keyrings k ON (f.keyring=k.id), uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
-    qs = q.getresult()
-    if len(qs) == 0:
-        return (None, None)
+    """
+    Return the uid,name,isdm for a given gpg fingerprint
+
+    @type fpr: string
+    @param fpr: a 40 byte GPG fingerprint
+
+    @return: (uid, name, isdm)
+    """
+    cursor = DBConn().cursor()
+    cursor.execute( "SELECT u.uid, u.name, k.debian_maintainer FROM fingerprint f JOIN keyrings k ON (f.keyring=k.id), uid u WHERE f.uid = u.id AND f.fingerprint = '%s'" % (fpr))
+    qs = cursor.fetchone()
+    if qs:
+        return qs
     else:
-        return qs[0]
+        return (None, None, False)
 
 def check_signed_by_key():
     """Ensure the .changes is signed by an authorized uploader."""
@@ -1012,17 +1019,22 @@ def check_signed_by_key():
         uid_name = ""
 
     # match claimed name with actual name:
-    if uid == None:
+    if uid is None:
+        # This is fundamentally broken but need us to refactor how we get
+        # the UIDs/Fingerprints in order for us to fix it properly
         uid, uid_email = changes["fingerprint"], uid
         may_nmu, may_sponsor = 1, 1
         # XXX by default new dds don't have a fingerprint/uid in the db atm,
         #     and can't get one in there if we don't allow nmu/sponsorship
-    elif is_dm is "t":
-        uid_email = uid
-        may_nmu, may_sponsor = 0, 0
-    else:
+    elif is_dm is False:
+        # If is_dm is False, we allow full upload rights
         uid_email = "%s@debian.org" % (uid)
         may_nmu, may_sponsor = 1, 1
+    else:
+        # Assume limited upload rights unless we've discovered otherwise
+        uid_email = uid
+        may_nmu, may_sponsor = 0, 0
+
 
     if uid_email in [changes["maintaineremail"], changes["changedbyemail"]]:
         sponsored = 0
@@ -1041,14 +1053,19 @@ def check_signed_by_key():
     if sponsored and not may_sponsor:
         reject("%s is not authorised to sponsor uploads" % (uid))
 
+    cursor = DBConn().cursor()
     if not sponsored and not may_nmu:
         source_ids = []
-        q = Upload.projectB.query("SELECT s.id, s.version FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = '%s' AND s.dm_upload_allowed = 'yes'" % (changes["source"]))
+        cursor.execute( "SELECT s.id, s.version FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = %(source)s AND s.dm_upload_allowed = 'yes'", changes )
 
         highest_sid, highest_version = None, None
 
         should_reject = True
-        for si in q.getresult():
+        while True:
+            si = cursor.fetchone()
+            if not si:
+                break
+
             if highest_version == None or apt_pkg.VersionCompare(si[1], highest_version) == 1:
                  highest_sid = si[0]
                  highest_version = si[1]
@@ -1056,8 +1073,14 @@ def check_signed_by_key():
         if highest_sid == None:
            reject("Source package %s does not have 'DM-Upload-Allowed: yes' in its most recent version" % changes["source"])
         else:
-            q = Upload.projectB.query("SELECT m.name FROM maintainer m WHERE m.id IN (SELECT su.maintainer FROM src_uploaders su JOIN source s ON (s.id = su.source) WHERE su.source = %s)" % (highest_sid))
-            for m in q.getresult():
+
+            cursor.execute("SELECT m.name FROM maintainer m WHERE m.id IN (SELECT su.maintainer FROM src_uploaders su JOIN source s ON (s.id = su.source) WHERE su.source = %s)" % (highest_sid))
+
+            while True:
+                m = cursor.fetchone()
+                if not m:
+                    break
+
                 (rfc822, rfc2047, name, email) = utils.fix_maintainer(m[0])
                 if email == uid_email or name == uid_name:
                     should_reject=False
@@ -1068,9 +1091,14 @@ def check_signed_by_key():
 
         for b in changes["binary"].keys():
             for suite in changes["distribution"].keys():
-                suite_id = database.get_suite_id(suite)
-                q = Upload.projectB.query("SELECT DISTINCT s.source FROM source s JOIN binaries b ON (s.id = b.source) JOIN bin_associations ba On (b.id = ba.bin) WHERE b.package = '%s' AND ba.suite = %s" % (b, suite_id))
-                for s in q.getresult():
+                suite_id = DBConn().get_suite_id(suite)
+
+                cursor.execute("SELECT DISTINCT s.source FROM source s JOIN binaries b ON (s.id = b.source) JOIN bin_associations ba On (b.id = ba.bin) WHERE b.package = %(package)s AND ba.suite = %(suite)s" , {'package':b, 'suite':suite_id} )
+                while True:
+                    s = cursor.fetchone()
+                    if not s:
+                        break
+
                     if s[0] != changes["source"]:
                         reject("%s may not hijack %s from source package %s in suite %s" % (uid, b, s, suite))
 
@@ -1111,10 +1139,10 @@ def upload_too_new():
 def action ():
     # changes["distribution"] may not exist in corner cases
     # (e.g. unreadable changes files)
-    if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType):
-        changes["distribution"] = {}
+    if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], DictType):
+        u.pkg.changes["distribution"] = {}
 
-    (summary, short_summary) = Upload.build_summaries()
+    (summary, short_summary) = u.build_summaries()
 
     # q-unapproved hax0ring
     queue_info = {
@@ -1122,13 +1150,14 @@ def action ():
          "Autobyhand" : { "is" : is_autobyhand, "process": do_autobyhand },
          "Byhand" : { "is": is_byhand, "process": do_byhand },
          "OldStableUpdate" : { "is": is_oldstableupdate,
-                                "process": do_oldstableupdate },
+                               "process": do_oldstableupdate },
          "StableUpdate" : { "is": is_stableupdate, "process": do_stableupdate },
          "Unembargo" : { "is": is_unembargo, "process": queue_unembargo },
          "Embargo" : { "is": is_embargo, "process": queue_embargo },
     }
+
     queues = [ "New", "Autobyhand", "Byhand" ]
-    if Cnf.FindB("Dinstall::SecurityQueueHandling"):
+    if cnf.FindB("Dinstall::SecurityQueueHandling"):
         queues += [ "Unembargo", "Embargo" ]
     else:
         queues += [ "OldStableUpdate", "StableUpdate" ]
@@ -1139,25 +1168,25 @@ def action ():
 
     queuekey = ''
 
-    if reject_message.find("Rejected") != -1:
-        if upload_too_new():
-            print "SKIP (too new)\n" + reject_message,
+    pi = u.package_info()
+
+    if len(u.rejects) > 0:
+        if u.upload_too_new():
+            print "SKIP (too new)\n" + pi,
             prompt = "[S]kip, Quit ?"
         else:
-            print "REJECT\n" + reject_message,
+            print "REJECT\n" + pi
             prompt = "[R]eject, Skip, Quit ?"
             if Options["Automatic"]:
                 answer = 'R'
     else:
         qu = None
         for q in queues:
-            if queue_info[q]["is"]():
+            if queue_info[q]["is"](u):
                 qu = q
                 break
         if qu:
-            print "%s for %s\n%s%s" % (
-                qu.upper(), ", ".join(changes["distribution"].keys()),
-                reject_message, summary),
+            print "%s for %s\n%s%s" % ( qu.upper(), ", ".join(u.pkg.changes["distribution"].keys()), pi, summary)
             queuekey = qu[0].upper()
             if queuekey in "RQSA":
                 queuekey = "D"
@@ -1167,187 +1196,148 @@ def action ():
             if Options["Automatic"]:
                 answer = queuekey
         else:
-            print "ACCEPT\n" + reject_message + summary,
+            print "ACCEPT\n" + pi + summary,
             prompt = "[A]ccept, Skip, Quit ?"
             if Options["Automatic"]:
                 answer = 'A'
 
     while prompt.find(answer) == -1:
         answer = utils.our_raw_input(prompt)
-        m = queue.re_default_answer.match(prompt)
+        m = re_default_answer.match(prompt)
         if answer == "":
             answer = m.group(1)
         answer = answer[:1].upper()
 
     if answer == 'R':
-        os.chdir (pkg.directory)
-        Upload.do_reject(0, reject_message)
+        os.chdir(u.pkg.directory)
+        u.do_reject(0, pi)
     elif answer == 'A':
-        accept(summary, short_summary)
-        remove_from_unchecked()
+        u.accept(summary, short_summary)
+        u.check_override()
+        u.remove()
     elif answer == queuekey:
-        queue_info[qu]["process"](summary, short_summary)
-        remove_from_unchecked()
+        queue_info[qu]["process"](u, summary, short_summary)
+        u.remove()
     elif answer == 'Q':
         sys.exit(0)
 
-def remove_from_unchecked():
-    os.chdir (pkg.directory)
-    for f in files.keys():
-        os.unlink(f)
-    os.unlink(pkg.changes_file)
-
-################################################################################
-
-def accept (summary, short_summary):
-    Upload.accept(summary, short_summary)
-    Upload.check_override()
-
 ################################################################################
 
-def move_to_dir (dest, perms=0660, changesperms=0664):
-    utils.move (pkg.changes_file, dest, perms=changesperms)
-    file_keys = files.keys()
-    for f in file_keys:
-        utils.move (f, dest, perms=perms)
+def package_to_suite(u, suite):
+    if not u.pkg.changes["distribution"].has_key(suite):
+        return False
 
-################################################################################
+    ret = True
 
-def is_unembargo ():
-    q = Upload.projectB.query(
-      "SELECT package FROM disembargo WHERE package = '%s' AND version = '%s'" %
-      (changes["source"], changes["version"]))
-    ql = q.getresult()
-    if ql:
-        return 1
+    if not u.pkg.changes["architecture"].has_key("source"):
+        s = DBConn().session()
+        q = s.query(SrcAssociation.sa_id)
+        q = q.join(Suite).filter_by(suite_name=suite)
+        q = q.join(DBSource).filter_by(source=u.pkg.changes['source'])
+        q = q.filter_by(version=u.pkg.changes['version']).limit(1)
 
-    oldcwd = os.getcwd()
-    os.chdir(Cnf["Dir::Queue::Disembargo"])
-    disdir = os.getcwd()
-    os.chdir(oldcwd)
+        if q.count() < 1:
+            ret = False
 
-    if pkg.directory == disdir:
-        if changes["architecture"].has_key("source"):
-            if Options["No-Action"]: return 1
+        s.close()
 
-            Upload.projectB.query(
-              "INSERT INTO disembargo (package, version) VALUES ('%s', '%s')" %
-              (changes["source"], changes["version"]))
-            return 1
+    return ret
 
-    return 0
+def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, announce=None):
+    cnf = Config()
+    dir = cnf["Dir::Queue::%s" % queue]
 
-def queue_unembargo (summary, short_summary):
-    print "Moving to UNEMBARGOED holding area."
-    Logger.log(["Moving to unembargoed", pkg.changes_file])
+    print "Moving to %s holding area" % queue.upper()
+    Logger.log(["Moving to %s" % queue, u.pkg.changes_file])
 
-    Upload.dump_vars(Cnf["Dir::Queue::Unembargoed"])
-    move_to_dir(Cnf["Dir::Queue::Unembargoed"])
-    Upload.queue_build("unembargoed", Cnf["Dir::Queue::Unembargoed"])
+    u.pkg.write_dot_dak(dir)
+    u.move_to_dir(dir, perms=perms)
+    if build:
+        get_queue(queue.lower()).autobuild_upload(u.pkg, dir)
 
     # Check for override disparities
-    Upload.Subst["__SUMMARY__"] = summary
-    Upload.check_override()
-
-    # Send accept mail, announce to lists, close bugs and check for
-    # override disparities
-    if not Cnf["Dinstall::Options::No-Mail"]:
-        Upload.Subst["__SUITE__"] = ""
-        mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted")
+    u.check_override()
+
+    # Send accept mail, announce to lists and close bugs
+    if announce and not cnf["Dinstall::Options::No-Mail"]:
+        template = os.path.join(cnf["Dir::Templates"], announce)
+        u.update_subst()
+        u.Subst["__SUITE__"] = ""
+        mail_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(mail_message)
-        Upload.announce(short_summary, 1)
+        u.announce(short_summary, True)
 
 ################################################################################
 
-def is_embargo ():
-    # if embargoed queues are enabled always embargo
-    return 1
+def is_unembargo(u):
+    session = DBConn().session()
+    cnf = Config()
 
-def queue_embargo (summary, short_summary):
-    print "Moving to EMBARGOED holding area."
-    Logger.log(["Moving to embargoed", pkg.changes_file])
+    q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version", u.pkg.changes)
+    if q.rowcount > 0:
+        session.close()
+        return True
 
-    Upload.dump_vars(Cnf["Dir::Queue::Embargoed"])
-    move_to_dir(Cnf["Dir::Queue::Embargoed"])
-    Upload.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"])
+    oldcwd = os.getcwd()
+    os.chdir(cnf["Dir::Queue::Disembargo"])
+    disdir = os.getcwd()
+    os.chdir(oldcwd)
 
-    # Check for override disparities
-    Upload.Subst["__SUMMARY__"] = summary
-    Upload.check_override()
-
-    # Send accept mail, announce to lists, close bugs and check for
-    # override disparities
-    if not Cnf["Dinstall::Options::No-Mail"]:
-        Upload.Subst["__SUITE__"] = ""
-        mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted")
-        utils.send_mail(mail_message)
-        Upload.announce(short_summary, 1)
+    ret = False
 
-################################################################################
+    if u.pkg.directory == disdir:
+        if u.pkg.changes["architecture"].has_key("source"):
+            if not Options["No-Action"]:
+                session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes)
+                session.commit()
 
-def is_stableupdate ():
-    if not changes["distribution"].has_key("proposed-updates"):
-        return 0
+            ret = True
 
-    if not changes["architecture"].has_key("source"):
-        pusuite = database.get_suite_id("proposed-updates")
-        q = Upload.projectB.query(
-          "SELECT S.source FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = '%s' AND s.version = '%s' AND sa.suite = %d" %
-          (changes["source"], changes["version"], pusuite))
-        ql = q.getresult()
-        if ql:
-            # source is already in proposed-updates so no need to hold
-            return 0
+    session.close()
 
-    return 1
+    return ret
+
+def queue_unembargo(u, summary, short_summary):
+    return package_to_queue(u, summary, short_summary, "Unembargoed",
+                            perms=0660, build=True, announce='process-unchecked.accepted')
 
-def do_stableupdate (summary, short_summary):
-    print "Moving to PROPOSED-UPDATES holding area."
-    Logger.log(["Moving to proposed-updates", pkg.changes_file]);
+################################################################################
 
-    Upload.dump_vars(Cnf["Dir::Queue::ProposedUpdates"]);
-    move_to_dir(Cnf["Dir::Queue::ProposedUpdates"], perms=0664)
+def is_embargo(u):
+    # if embargoed queues are enabled always embargo
+    return True
 
-    # Check for override disparities
-    Upload.Subst["__SUMMARY__"] = summary;
-    Upload.check_override();
+def queue_embargo(u, summary, short_summary):
+    return package_to_queue(u, summary, short_summary, "Unembargoed",
+                            perms=0660, build=True, announce='process-unchecked.accepted')
 
 ################################################################################
 
-def is_oldstableupdate ():
-    if not changes["distribution"].has_key("oldstable-proposed-updates"):
-        return 0
-
-    if not changes["architecture"].has_key("source"):
-        pusuite = database.get_suite_id("oldstable-proposed-updates")
-        q = Upload.projectB.query(
-          "SELECT S.source FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = '%s' AND s.version = '%s' AND sa.suite = %d" %
-          (changes["source"], changes["version"], pusuite))
-        ql = q.getresult()
-        if ql:
-            # source is already in oldstable-proposed-updates so no need to hold
-            return 0
+def is_stableupdate(u):
+    return package_to_suite(u, 'proposed-updates')
 
-    return 1
+def do_stableupdate(u, summary, short_summary):
+    return package_to_queue(u, summary, short_summary, "ProposedUpdates",
+                            perms=0664, build=False, announce=None)
 
-def do_oldstableupdate (summary, short_summary):
-    print "Moving to OLDSTABLE-PROPOSED-UPDATES holding area."
-    Logger.log(["Moving to oldstable-proposed-updates", pkg.changes_file]);
+################################################################################
 
-    Upload.dump_vars(Cnf["Dir::Queue::OldProposedUpdates"]);
-    move_to_dir(Cnf["Dir::Queue::OldProposedUpdates"], perms=0664)
+def is_oldstableupdate(u):
+    return package_to_suite(u, 'oldstable-proposed-updates')
 
-    # Check for override disparities
-    Upload.Subst["__SUMMARY__"] = summary;
-    Upload.check_override();
+def do_oldstableupdate(u, summary, short_summary):
+    return package_to_queue(u, summary, short_summary, "OldProposedUpdates",
+                            perms=0664, build=False, announce=None)
 
 ################################################################################
 
-def is_autobyhand ():
+def is_autobyhand(u):
+    cnf = Config()
+
     all_auto = 1
     any_auto = 0
-    for f in files.keys():
-        if files[f].has_key("byhand"):
+    for f in u.pkg.files.keys():
+        if u.pkg.files[f].has_key("byhand"):
             any_auto = 1
 
             # filename is of form "PKG_VER_ARCH.EXT" where PKG, VER and ARCH
@@ -1359,95 +1349,98 @@ def is_autobyhand ():
                 continue
 
             (pckg, ver, archext) = f.split("_", 2)
-            if archext.count(".") < 1 or changes["version"] != ver:
+            if archext.count(".") < 1 or u.pkg.changes["version"] != ver:
                 all_auto = 0
                 continue
 
-            ABH = Cnf.SubTree("AutomaticByHandPackages")
+            ABH = cnf.SubTree("AutomaticByHandPackages")
             if not ABH.has_key(pckg) or \
-              ABH["%s::Source" % (pckg)] != changes["source"]:
-                print "not match %s %s" % (pckg, changes["source"])
+              ABH["%s::Source" % (pckg)] != u.pkg.changes["source"]:
+                print "not match %s %s" % (pckg, u.pkg.changes["source"])
                 all_auto = 0
                 continue
 
             (arch, ext) = archext.split(".", 1)
-            if arch not in changes["architecture"]:
+            if arch not in u.pkg.changes["architecture"]:
                 all_auto = 0
                 continue
 
-            files[f]["byhand-arch"] = arch
-            files[f]["byhand-script"] = ABH["%s::Script" % (pckg)]
+            u.pkg.files[f]["byhand-arch"] = arch
+            u.pkg.files[f]["byhand-script"] = ABH["%s::Script" % (pckg)]
 
     return any_auto and all_auto
 
-def do_autobyhand (summary, short_summary):
+def do_autobyhand(u, summary, short_summary):
     print "Attempting AUTOBYHAND."
-    byhandleft = 0
-    for f in files.keys():
+    byhandleft = True
+    for f, entry in u.pkg.files.items():
         byhandfile = f
-        if not files[f].has_key("byhand"):
+
+        if not entry.has_key("byhand"):
             continue
-        if not files[f].has_key("byhand-script"):
-            byhandleft = 1
+
+        if not entry.has_key("byhand-script"):
+            byhandleft = True
             continue
 
         os.system("ls -l %s" % byhandfile)
+
         result = os.system("%s %s %s %s %s" % (
-                files[f]["byhand-script"], byhandfile,
-                changes["version"], files[f]["byhand-arch"],
-                os.path.abspath(pkg.changes_file)))
+                entry["byhand-script"],
+                byhandfile,
+                u.pkg.changes["version"],
+                entry["byhand-arch"],
+                os.path.abspath(u.pkg.changes_file)))
+
         if result == 0:
             os.unlink(byhandfile)
-            del files[f]
+            del entry
         else:
             print "Error processing %s, left as byhand." % (f)
-            byhandleft = 1
+            byhandleft = True
 
     if byhandleft:
-        do_byhand(summary, short_summary)
+        do_byhand(u, summary, short_summary)
     else:
-        accept(summary, short_summary)
+        u.accept(summary, short_summary)
+        u.check_override()
+        # XXX: We seem to be missing a u.remove() here
+        #      This might explain why we get byhand leftovers in unchecked - mhy
 
 ################################################################################
 
-def is_byhand ():
-    for f in files.keys():
-        if files[f].has_key("byhand"):
-            return 1
-    return 0
+def is_byhand(u):
+    for f in u.pkg.files.keys():
+        if u.pkg.files[f].has_key("byhand"):
+            return True
+    return False
 
-def do_byhand (summary, short_summary):
-    print "Moving to BYHAND holding area."
-    Logger.log(["Moving to byhand", pkg.changes_file])
-
-    Upload.dump_vars(Cnf["Dir::Queue::Byhand"])
-    move_to_dir(Cnf["Dir::Queue::Byhand"])
-
-    # Check for override disparities
-    Upload.Subst["__SUMMARY__"] = summary
-    Upload.check_override()
+def do_byhand(u, summary, short_summary):
+    return package_to_queue(u, summary, short_summary, "Byhand",
+                            perms=0660, build=False, announce=None)
 
 ################################################################################
 
-def is_new ():
-    for f in files.keys():
-        if files[f].has_key("new"):
-            return 1
-    return 0
+def is_new(u):
+    for f in u.pkg.files.keys():
+        if u.pkg.files[f].has_key("new"):
+            return True
+    return False
 
-def acknowledge_new (summary, short_summary):
-    Subst = Upload.Subst
+def acknowledge_new(u, summary, short_summary):
+    cnf = Config()
 
     print "Moving to NEW holding area."
-    Logger.log(["Moving to new", pkg.changes_file])
+    Logger.log(["Moving to new", u.pkg.changes_file])
 
-    Upload.dump_vars(Cnf["Dir::Queue::New"])
-    move_to_dir(Cnf["Dir::Queue::New"])
+    u.pkg.write_dot_dak(cnf["Dir::Queue::New"])
+    u.move_to_dir(cnf["Dir::Queue::New"], perms=0640, changesperms=0644)
 
     if not Options["No-Mail"]:
         print "Sending new ack."
-        Subst["__SUMMARY__"] = summary
-        new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.new")
+        template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new')
+        u.Subst["__SUMMARY__"] = summary
+        new_ack_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(new_ack_message)
 
 ################################################################################
@@ -1461,73 +1454,99 @@ def acknowledge_new (summary, short_summary):
 # we force the .orig.tar.gz into the .changes structure and reprocess
 # the .changes file.
 
-def process_it (changes_file):
-    global reprocess, reject_message
+def process_it(changes_file):
+    global Logger
+
+    cnf = Config()
+
+    holding = Holding()
+
+    u = Upload()
+    u.pkg.changes_file = changes_file
+    u.pkg.directory = os.getcwd()
+    u.logger = Logger
 
-    # Reset some globals
-    reprocess = 1
-    Upload.init_vars()
     # Some defaults in case we can't fully process the .changes file
-    changes["maintainer2047"] = Cnf["Dinstall::MyEmailAddress"]
-    changes["changedby2047"] = Cnf["Dinstall::MyEmailAddress"]
-    reject_message = ""
+    u.pkg.changes["maintainer2047"] = cnf["Dinstall::MyEmailAddress"]
+    u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"]
 
-    # Absolutize the filename to avoid the requirement of being in the
-    # same directory as the .changes file.
-    pkg.changes_file = os.path.abspath(changes_file)
+    # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header
+    bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $"
+    if cnf.has_key("Dinstall::Bcc"):
+        u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"])
+    else:
+        u.Subst["__BCC__"] = bcc
 
     # Remember where we are so we can come back after cd-ing into the
-    # holding directory.
-    pkg.directory = os.getcwd()
+    # holding directory.  TODO: Fix this stupid hack
+    u.prevdir = os.getcwd()
+
+    # TODO: Figure out something better for this (or whether it's even
+    #       necessary - it seems to have been for use when we were
+    #       still doing the is_unchecked check; reprocess = 2)
+    u.reprocess = 1
 
     try:
         # If this is the Real Thing(tm), copy things into a private
         # holding directory first to avoid replacable file races.
         if not Options["No-Action"]:
-            os.chdir(Cnf["Dir::Queue::Holding"])
-            copy_to_holding(pkg.changes_file)
+            os.chdir(cnf["Dir::Queue::Holding"])
+
+            # Absolutize the filename to avoid the requirement of being in the
+            # same directory as the .changes file.
+            holding.copy_to_holding(os.path.abspath(changes_file))
+
             # Relativize the filename so we use the copy in holding
             # rather than the original...
-            pkg.changes_file = os.path.basename(pkg.changes_file)
-        changes["fingerprint"] = utils.check_signature(pkg.changes_file, reject)
-        if changes["fingerprint"]:
-            valid_changes_p = check_changes()
+            changespath = os.path.basename(u.pkg.changes_file)
+
+        (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changespath)
+
+        if u.pkg.changes["fingerprint"]:
+            valid_changes_p = u.load_changes(changespath)
         else:
-            valid_changes_p = 0
+            valid_changes_p = False
+	    u.rejects.extend(rejects)
+
         if valid_changes_p:
-            while reprocess:
-                check_distributions()
-                check_files()
-                valid_dsc_p = check_dsc()
+            while u.reprocess:
+                u.check_distributions()
+                u.check_files(not Options["No-Action"])
+                valid_dsc_p = u.check_dsc(not Options["No-Action"])
                 if valid_dsc_p:
-                    check_source()
-                check_hashes()
-                check_urgency()
-                check_timestamps()
-                check_signed_by_key()
-        Upload.update_subst(reject_message)
-        action()
+                    u.check_source()
+                u.check_hashes()
+                u.check_urgency()
+                u.check_timestamps()
+                u.check_signed_by_key()
+
+        action(u)
+
     except SystemExit:
         raise
+
     except:
         print "ERROR"
         traceback.print_exc(file=sys.stderr)
-        pass
 
     # Restore previous WD
-    os.chdir(pkg.directory)
+    os.chdir(u.prevdir)
 
 ###############################################################################
 
 def main():
-    global Cnf, Options, Logger
+    global Options, Logger
 
+    cnf = Config()
     changes_files = init()
 
     # -n/--dry-run invalidates some other options which would involve things happening
     if Options["No-Action"]:
         Options["Automatic"] = ""
 
+    # Initialize our Holding singleton
+    holding = Holding()
+
     # Ensure all the arguments we were given are .changes files
     for f in changes_files:
         if not f.endswith(".changes"):
@@ -1535,17 +1554,18 @@ def main():
             changes_files.remove(f)
 
     if changes_files == []:
-        utils.fubar("Need at least one .changes file as an argument.")
+        if cnf["Dinstall::Options::Directory"] == "":
+            utils.fubar("Need at least one .changes file as an argument.")
+        else:
+            sys.exit(0)
 
     # Check that we aren't going to clash with the daily cron job
-
-    if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (Cnf["Dir::Lock"])) and not Options["No-Lock"]:
+    if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (cnf["Dir::Lock"])) and not Options["No-Lock"]:
         utils.fubar("Archive maintenance in progress.  Try again later.")
 
     # Obtain lock if not in no-action mode and initialize the log
-
     if not Options["No-Action"]:
-        lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT)
+        lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT)
         try:
             fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB)
         except IOError, e:
@@ -1553,15 +1573,7 @@ def main():
                 utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")
             else:
                 raise
-        Logger = Upload.Logger = logging.Logger(Cnf, "process-unchecked")
-
-    # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header
-    bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $"
-    if Cnf.has_key("Dinstall::Bcc"):
-        Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"])
-    else:
-        Upload.Subst["__BCC__"] = bcc
-
+        Logger = daklog.Logger(cnf, "process-unchecked")
 
     # Sort the .changes files so that we process sourceful ones first
     changes_files.sort(utils.changes_compare)
@@ -1573,10 +1585,11 @@ def main():
             process_it (changes_file)
         finally:
             if not Options["No-Action"]:
-                clean_holding()
+                holding.clean()
+
+    accept_count = SummaryStats().accept_count
+    accept_bytes = SummaryStats().accept_bytes
 
-    accept_count = Upload.accept_count
-    accept_bytes = Upload.accept_bytes
     if accept_count:
         sets = "set"
         if accept_count > 1: