]> git.decadent.org.uk Git - dak.git/commitdiff
Merge branch 'master' into maintainer
authorTorsten Werner <twerner@debian.org>
Thu, 24 Mar 2011 20:58:04 +0000 (21:58 +0100)
committerTorsten Werner <twerner@debian.org>
Thu, 24 Mar 2011 20:58:04 +0000 (21:58 +0100)
config/debian-security/dak.conf
dak/admin.py
dak/control_suite.py
dak/dakdb/update52.py [new file with mode: 0755]
dak/generate_releases.py
dak/split_done.py
dak/update_db.py
daklib/dbconn.py
daklib/queue.py
daklib/regexes.py

index b03e0f89826e67cd3bfe3e0d7589fad153a2b8aa..cdfe9ea648be6ed61d01406c25164cec746cc8e7 100644 (file)
@@ -31,7 +31,7 @@ Dinstall
    SecurityQueueHandling "true";     
    SecurityQueueBuild "true";     
    DefaultSuite "stable";
-   SuiteSuffix "updates";
+   SuiteSuffix "updates/";
    OverrideMaintainer "dak@security.debian.org";
    LegacyStableHasNoSections "false";
 };
index 218eea578ed7ef9bf5f78a32898f745570c91827..808fb88785edb626b99d46881da114a58f276ee5 100755 (executable)
@@ -25,6 +25,7 @@ import apt_pkg
 
 from daklib import utils
 from daklib.dbconn import *
+from sqlalchemy.orm.exc import NoResultFound
 
 ################################################################################
 
@@ -83,6 +84,15 @@ Perform administrative work on the dak database.
      s-a add SUITE ARCH     add ARCH to suite
      s-a rm SUITE ARCH      remove ARCH from suite (will only work if
                             no packages remain for the arch in the suite)
+
+  version-check / v-c:
+     v-c list                        show version checks for all suites
+     v-c list-suite SUITE            show version checks for suite SUITE
+     v-c add SUITE CHECK REFERENCE   add a version check for suite SUITE
+     v-c rm SUITE CHECK REFERENCE    rmove a version check
+       where
+         CHECK     is one of Enhances, MustBeNewerThan, MustBeOlderThan
+        REFERENCE is another suite name
 """
     sys.exit(exit_code)
 
@@ -333,6 +343,78 @@ dispatch['s-a'] = suite_architecture
 
 ################################################################################
 
+def __version_check_list(d):
+    session = d.session()
+    for s in session.query(Suite).order_by('suite_name'):
+        __version_check_list_suite(d, s.suite_name)
+
+def __version_check_list_suite(d, suite_name):
+    vcs = get_version_checks(suite_name)
+    for vc in vcs:
+        print "%s %s %s" % (suite_name, vc.check, vc.reference.suite_name)
+
+def __version_check_add(d, suite_name, check, reference_name):
+    suite = get_suite(suite_name)
+    if not suite:
+        die("E: Could not find suite %s." % (suite_name))
+    reference = get_suite(reference_name)
+    if not reference:
+        die("E: Could not find reference suite %s." % (reference_name))
+
+    session = d.session()
+    vc = VersionCheck()
+    vc.suite = suite
+    vc.check = check
+    vc.reference = reference
+    session.add(vc)
+    session.commit()
+
+def __version_check_rm(d, suite_name, check, reference_name):
+    suite = get_suite(suite_name)
+    if not suite:
+        die("E: Could not find suite %s." % (suite_name))
+    reference = get_suite(reference_name)
+    if not reference:
+        die("E: Could not find reference suite %s." % (reference_name))
+
+    session = d.session()
+    try:
+      vc = session.query(VersionCheck).filter_by(suite=suite, check=check, reference=reference).one()
+      session.delete(vc)
+      session.commit()
+    except NoResultFound:
+      print "W: version-check not found."
+
+def version_check(command):
+    args = [str(x) for x in command]
+    Cnf = utils.get_conf()
+    d = DBConn()
+
+    die_arglen(args, 2, "E: version-check needs at least a command")
+    mode = args[1].lower()
+
+    if mode == 'list':
+        __version_check_list(d)
+    elif mode == 'list-suite':
+        if len(args) != 3:
+            die("E: version-check list-suite needs a single parameter")
+        __version_check_list_suite(d, args[2])
+    elif mode == 'add':
+        if len(args) != 5:
+            die("E: version-check add needs three parameters")
+        __version_check_add(d, args[2], args[3], args[4])
+    elif mode == 'rm':
+        if len(args) != 5:
+            die("E: version-check rm needs three parameters")
+        __version_check_rm(d, args[2], args[3], args[4])
+    else:
+        die("E: version-check command unknown")
+
+dispatch['version-check'] = version_check
+dispatch['v-c'] = version_check
+
+################################################################################
+
 def show_config(command):
     args = [str(x) for x in command]
     cnf = utils.get_conf()
index 7ec321f0a8474f2962dd4d47b1d95bf2e324f8f1..740b88365d6b630580f6c0904f6560b52c7a0139 100755 (executable)
@@ -49,6 +49,7 @@ from daklib.config import Config
 from daklib.dbconn import *
 from daklib import daklog
 from daklib import utils
+from daklib.queue import get_suite_version_by_package, get_suite_version_by_source
 
 #######################################################################################
 
@@ -160,7 +161,39 @@ def britney_changelog(packages, suite, session):
 
 #######################################################################################
 
-def set_suite(file, suite, session, britney=False):
+def version_checks(package, architecture, target_suite, new_version, session, force = False):
+    if architecture == "source":
+        suite_version_list = get_suite_version_by_source(package, session)
+    else:
+        suite_version_list = get_suite_version_by_package(package, architecture, session)
+
+    must_be_newer_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeNewerThan") ]
+    must_be_older_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeOlderThan") ]
+
+    # Must be newer than an existing version in target_suite
+    if target_suite not in must_be_newer_than:
+        must_be_newer_than.append(target_suite)
+
+    violations = False
+
+    for suite, version in suite_version_list:
+        cmp = apt_pkg.VersionCompare(new_version, version)
+        if suite in must_be_newer_than and cmp < 1:
+            utils.warn("%s (%s): version check violated: %s targeted at %s is *not* newer than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
+            violations = True
+        if suite in must_be_older_than and cmp > 1:
+            utils.warn("%s (%s): version check violated: %s targeted at %s is *not* older than %s in %s" % (package, architecture, new_version, target_suite, version, suite))
+            violations = True
+
+    if violations:
+        if force:
+            utils.warn("Continuing anyway (forced)...")
+        else:
+            utils.fubar("Aborting. Version checks violated and not forced.")
+
+#######################################################################################
+
+def set_suite(file, suite, session, britney=False, force=False):
     suite_id = suite.suite_id
     lines = file.readlines()
 
@@ -209,6 +242,7 @@ def set_suite(file, suite, session, britney=False):
     for key in desired.keys():
         if not current.has_key(key):
             (package, version, architecture) = key.split()
+            version_checks(package, architecture, suite.suite_name, version, session, force)
             pkid = get_id (package, version, architecture, session)
             if not pkid:
                 continue
@@ -227,9 +261,9 @@ def set_suite(file, suite, session, britney=False):
 
 #######################################################################################
 
-def process_file(file, suite, action, session, britney=False):
+def process_file(file, suite, action, session, britney=False, force=False):
     if action == "set":
-        set_suite(file, suite, session, britney)
+        set_suite(file, suite, session, britney, force)
         return
 
     suite_id = suite.suite_id
@@ -249,6 +283,10 @@ def process_file(file, suite, action, session, britney=False):
         if not pkid:
             continue
 
+        # Do version checks when adding packages
+        if action == "add":
+            version_checks(package, architecture, suite.suite_name, version, session, force)
+
         if architecture == "source":
             # Find the existing association ID, if any
             q = session.execute("""SELECT id FROM src_associations
@@ -333,6 +371,7 @@ def main ():
 
     Arguments = [('a',"add","Control-Suite::Options::Add", "HasArg"),
                  ('b',"britney","Control-Suite::Options::Britney"),
+                 ('f','force','Control-Suite::Options::Force'),
                  ('h',"help","Control-Suite::Options::Help"),
                  ('l',"list","Control-Suite::Options::List","HasArg"),
                  ('r',"remove", "Control-Suite::Options::Remove", "HasArg"),
@@ -354,6 +393,8 @@ def main ():
 
     session = DBConn().session()
 
+    force = Options.has_key("Force") and Options["Force"]
+
     action = None
 
     for i in ("add", "list", "remove", "set"):
@@ -386,9 +427,9 @@ def main ():
         Logger = daklog.Logger(cnf.Cnf, "control-suite")
         if file_list:
             for f in file_list:
-                process_file(utils.open_file(f), suite, action, session, britney)
+                process_file(utils.open_file(f), suite, action, session, britney, force)
         else:
-            process_file(sys.stdin, suite, action, session, britney)
+            process_file(sys.stdin, suite, action, session, britney, force)
         Logger.close()
 
 #######################################################################################
diff --git a/dak/dakdb/update52.py b/dak/dakdb/update52.py
new file mode 100755 (executable)
index 0000000..d38ee26
--- /dev/null
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add table for version checks.
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+import psycopg2
+from daklib.dak_exceptions import DBUpdateError
+from daklib.config import Config
+
+################################################################################
+def do_update(self):
+    """
+    Add table for version checks.
+    """
+    print __doc__
+    try:
+        cnf = Config()
+        c = self.db.cursor()
+
+        c.execute("""
+            CREATE TABLE version_check (
+                suite INTEGER NOT NULL REFERENCES suite(id),
+                "check" TEXT NOT NULL CHECK ("check" IN ('Enhances', 'MustBeNewerThan', 'MustBeOlderThan')),
+                reference INTEGER NOT NULL REFERENCES suite(id),
+                PRIMARY KEY(suite, "check", reference)
+            )""")
+
+        c.execute("SELECT suite_name, id FROM suite")
+        suites = c.fetchall()
+        suite_id_map = {}
+        for suite_name, suite_id in suites:
+            suite_id_map[suite_name] = suite_id
+
+        for check in ["Enhances", "MustBeNewerThan", "MustBeOlderThan"]:
+           for suite_name in suite_id_map.keys():
+              for reference_name in [ s.lower() for s in cnf.ValueList("Suite::%s::VersionChecks::%s" % (suite_name, check)) ]:
+                   c.execute("""INSERT INTO version_check (suite, "check", reference) VALUES (%s, %s, %s)""", (suite_id_map[suite_name], check, suite_id_map[reference_name]))
+
+        c.execute("UPDATE config SET value = '52' WHERE name = 'db_revision'")
+        self.db.commit()
+
+    except psycopg2.ProgrammingError, msg:
+        self.db.rollback()
+        raise DBUpdateError, 'Unable to apply sick update 52, rollback issued. Error message : %s' % (str(msg))
index 12ac16ef213d890fd08a1763aaa84f5083a00bb8..e67bd91f6d2b3e0ed0078dc93d72d1e0c51002a9 100755 (executable)
@@ -1,12 +1,15 @@
 #!/usr/bin/env python
 
-""" Create all the Release files
+"""
+Create all the Release files
 
 @contact: Debian FTPMaster <ftpmaster@debian.org>
-@Copyright: 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
-@copyright: 2009, 2011  Joerg Jaspert <joerg@debian.org>
+@copyright: 2011  Joerg Jaspert <joerg@debian.org>
+@copyright: 2011  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
 # the Free Software Foundation; either version 2 of the License, or
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-#   ``Bored now''
+################################################################################
+
+# <mhy> I wish they wouldnt leave biscuits out, thats just tempting. Damnit.
 
 ################################################################################
 
 import sys
 import os
+import os.path
 import stat
 import time
 import gzip
 import bz2
 import apt_pkg
+from tempfile import mkstemp, mkdtemp
+import commands
+from multiprocessing import Pool, TimeoutError
+from sqlalchemy.orm import object_session
 
-from daklib import utils
+from daklib import utils, daklog
+from daklib.regexes import re_gensubrelease, re_includeinrelease
 from daklib.dak_exceptions import *
 from daklib.dbconn import *
 from daklib.config import Config
 
 ################################################################################
-
-Cnf = None
-out = None
-AptCnf = None
+Logger = None                  #: Our logging object
+results = []                   #: Results of the subprocesses
 
 ################################################################################
 
 def usage (exit_code=0):
-    print """Usage: dak generate-releases [OPTION]... [SUITE]...
-Generate Release files (for SUITE).
+    """ Usage information"""
 
-  -h, --help                 show this help and exit
-  -a, --apt-conf FILE        use FILE instead of default apt.conf
-  -f, --force-touch          ignore Untouchable directives in dak.conf
+    print """Usage: dak generate-releases [OPTIONS]
+Generate the Release files
 
-If no SUITE is given Release files are generated for all suites."""
+  -s, --suite=SUITE(s)       process this suite
+                             Default: All suites not marked 'untouchable'
+  -f, --force                Allow processing of untouchable suites
+                             CAREFUL: Only to be used at (point) release time!
+  -h, --help                 show this help and exit
 
+SUITE can be a space seperated list, e.g.
+   --suite=unstable testing
+  """
     sys.exit(exit_code)
 
-################################################################################
+########################################################################
 
-def add_tiffani (files, path, indexstem):
-    index = "%s.diff/Index" % (indexstem)
-    filepath = "%s/%s" % (path, index)
-    if os.path.exists(filepath):
-        #print "ALERT: there was a tiffani file %s" % (filepath)
-        files.append(index)
-
-def gen_i18n_index (files, tree, sec):
-    path = Cnf["Dir::Root"] + tree + "/"
-    i18n_path = "%s/i18n" % (sec)
-    if os.path.exists("%s/%s" % (path, i18n_path)):
-        index = "%s/Index" % (i18n_path)
-        out = open("%s/%s" % (path, index), "w")
-        out.write("SHA1:\n")
-        for x in os.listdir("%s/%s" % (path, i18n_path)):
-            if x.startswith('Translation-'):
-                f = open("%s/%s/%s" % (path, i18n_path, x), "r")
-                size = os.fstat(f.fileno())[6]
-                f.seek(0)
-                sha1sum = apt_pkg.sha1sum(f)
-                f.close()
-                out.write(" %s %7d %s\n" % (sha1sum, size, x))
-        out.close()
-        files.append(index)
-
-def compressnames (tree,type,file):
-    compress = AptCnf.get("%s::%s::Compress" % (tree,type), AptCnf.get("Default::%s::Compress" % (type), ". gzip"))
-    result = []
-    cl = compress.split()
-    uncompress = ("." not in cl)
-    for mode in compress.split():
-        if mode == ".":
-            result.append(file)
-        elif mode == "gzip":
-            if uncompress:
-                result.append("<zcat/.gz>" + file)
-                uncompress = 0
-            result.append(file + ".gz")
-        elif mode == "bzip2":
-            if uncompress:
-                result.append("<bzcat/.bz2>" + file)
-                uncompress = 0
-            result.append(file + ".bz2")
-    return result
-
-decompressors = { 'zcat' : gzip.GzipFile,
-                  'bzip2' : bz2.BZ2File }
-
-hashfuncs = { 'MD5Sum' : apt_pkg.md5sum,
-              'SHA1' : apt_pkg.sha1sum,
-              'SHA256' : apt_pkg.sha256sum }
-
-def print_hash_files (tree, files, hashop):
-    path = Cnf["Dir::Root"] + tree + "/"
-    for name in files:
-        hashvalue = ""
-        hashlen = 0
-        try:
-            if name[0] == "<":
-                j = name.index("/")
-                k = name.index(">")
-                (cat, ext, name) = (name[1:j], name[j+1:k], name[k+1:])
-                file_handle = decompressors[ cat ]( "%s%s%s" % (path, name, ext) )
-                contents = file_handle.read()
-                hashvalue = hashfuncs[ hashop ](contents)
-                hashlen = len(contents)
+def get_result(arg):
+    global results
+    if arg:
+        results.append(arg)
+
+def sign_release_dir(dirname):
+    cnf = Config()
+
+    if cnf.has_key("Dinstall::SigningKeyring"):
+        keyring = "--secret-keyring \"%s\"" % cnf["Dinstall::SigningKeyring"]
+        if cnf.has_key("Dinstall::SigningPubKeyring"):
+            keyring += " --keyring \"%s\"" % cnf["Dinstall::SigningPubKeyring"]
+
+        arguments = "--no-options --batch --no-tty --armour"
+        signkeyids = cnf.signingkeyids.split()
+
+        relname = os.path.join(dirname, 'Release')
+
+        dest = os.path.join(dirname, 'Release.gpg')
+        if os.path.exists(dest):
+            os.unlink(dest)
+
+        inlinedest = os.path.join(dirname, 'InRelease')
+        if os.path.exists(inlinedest):
+            os.unlink(inlinedest)
+
+        for keyid in signkeyids:
+            if keyid != "":
+                defkeyid = "--default-key %s" % keyid
             else:
-                try:
-                    file_handle = utils.open_file(path + name)
-                    hashvalue = hashfuncs[ hashop ](file_handle)
-                    hashlen = os.stat(path + name).st_size
-                except:
-                    raise
-                else:
-                    if file_handle:
-                        file_handle.close()
-
-        except CantOpenError:
-            print "ALERT: Couldn't open " + path + name
-        except IOError:
-            print "ALERT: IOError when reading %s" % (path + name)
-            raise
-        else:
-            out.write(" %s %8d %s\n" % (hashvalue, hashlen, name))
-
-def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic="", butautomaticupgrades=""):
-    try:
-        if os.access(relpath, os.F_OK):
-            if os.stat(relpath).st_nlink > 1:
-                os.unlink(relpath)
-        release = open(relpath, "w")
-    except IOError:
-        utils.fubar("Couldn't write to " + relpath)
-
-    release.write("Archive: %s\n" % (suite))
-    if version != "":
-        release.write("Version: %s\n" % (version))
-
-    if suite_suffix:
-        release.write("Component: %s/%s\n" % (suite_suffix,component))
-    else:
-        release.write("Component: %s\n" % (component))
+                defkeyid = ""
 
-    release.write("Origin: %s\n" % (origin))
-    release.write("Label: %s\n" % (label))
-    if notautomatic != "":
-        release.write("NotAutomatic: %s\n" % (notautomatic))
-    if butautomaticupgrades != "":
-        release.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades))
-    release.write("Architecture: %s\n" % (arch))
-    release.close()
+            os.system("gpg %s %s %s --detach-sign <%s >>%s" %
+                    (keyring, defkeyid, arguments, relname, dest))
+
+            os.system("gpg %s %s %s --clearsign <%s >>%s" %
+                    (keyring, defkeyid, arguments, relname, inlinedest))
+
+class ReleaseWriter(object):
+    def __init__(self, suite):
+        self.suite = suite
+
+    def generate_release_files(self):
+        """
+        Generate Release files for the given suite
+
+        @type suite: string
+        @param suite: Suite name
+        """
+
+        suite = self.suite
+        session = object_session(suite)
+
+        architectures = get_suite_architectures(suite.suite_name, skipall=True, skipsrc=True, session=session)
+
+        # Attribs contains a tuple of field names and the database names to use to
+        # fill them in
+        attribs = ( ('Origin',      'origin'),
+                    ('Label',       'label'),
+                    ('Suite',       'suite_name'),
+                    ('Version',     'version'),
+                    ('Codename',    'codename') )
+
+        # A "Sub" Release file has slightly different fields
+        subattribs = ( ('Origin',   'origin'),
+                       ('Label',    'label'),
+                       ('Archive',  'suite_name'),
+                       ('Version',  'version') )
+
+        # Boolean stuff. If we find it true in database, write out "yes" into the release file
+        boolattrs = ( ('NotAutomatic',         'notautomatic'),
+                      ('ButAutomaticUpgrades', 'butautomaticupgrades') )
+
+        cnf = Config()
+
+        suite_suffix = "%s" % (cnf.Find("Dinstall::SuiteSuffix"))
+
+        outfile = os.path.join(cnf["Dir::Root"], 'dists', "%s/%s" % (suite.suite_name, suite_suffix), "Release")
+        out = open(outfile, "w")
+
+        for key, dbfield in attribs:
+            if getattr(suite, dbfield) is not None:
+                out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
+
+        out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
+
+        if suite.validtime:
+            validtime=float(suite.validtime)
+            out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime))))
+
+        for key, dbfield in boolattrs:
+            if getattr(suite, dbfield, False):
+                out.write("%s: yes\n" % (key))
+
+        out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
+
+        ## FIXME: Components need to be adjusted to whatever will be in the db
+        ## Needs putting in the DB
+        components = ['main', 'contrib', 'non-free']
+
+        out.write("Components: %s\n" % ( " ".join(map(lambda x: "%s%s" % (suite_suffix, x), components ))))
+
+        # For exact compatibility with old g-r, write out Description here instead
+        # of with the rest of the DB fields above
+        if getattr(suite, 'description') is not None:
+            out.write("Description: %s\n" % suite.description)
+
+        for comp in components:
+            for dirpath, dirnames, filenames in os.walk("%sdists/%s/%s" % (cnf["Dir::Root"], suite.suite_name, comp), topdown=True):
+                if not re_gensubrelease.match(dirpath):
+                    continue
+
+                subfile = os.path.join(dirpath, "Release")
+                subrel = open(subfile, "w")
+
+                for key, dbfield in subattribs:
+                    if getattr(suite, dbfield) is not None:
+                        subrel.write("%s: %s\n" % (key, getattr(suite, dbfield)))
+
+                for key, dbfield in boolattrs:
+                    if getattr(suite, dbfield, False):
+                        subrel.write("%s: yes\n" % (key))
+
+                subrel.write("Component: %s%s\n" % (suite_suffix, comp))
+                subrel.close()
+
+        # Now that we have done the groundwork, we want to get off and add the files with
+        # their checksums to the main Release file
+        oldcwd = os.getcwd()
+
+        os.chdir("%sdists/%s/%s" % (cnf["Dir::Root"], suite.suite_name, suite_suffix))
+
+        hashfuncs = { 'MD5Sum' : apt_pkg.md5sum,
+                      'SHA1' : apt_pkg.sha1sum,
+                      'SHA256' : apt_pkg.sha256sum }
+
+        fileinfo = {}
+
+        uncompnotseen = {}
+
+        for dirpath, dirnames, filenames in os.walk(".", followlinks=True, topdown=True):
+            for entry in filenames:
+                # Skip things we don't want to include
+                if not re_includeinrelease.match(entry):
+                    continue
+
+                if dirpath == '.' and entry in ["Release", "Release.gpg", "InRelease"]:
+                    continue
+
+                filename = os.path.join(dirpath.lstrip('./'), entry)
+                fileinfo[filename] = {}
+                contents = open(filename, 'r').read()
+
+                # If we find a file for which we have a compressed version and
+                # haven't yet seen the uncompressed one, store the possibility
+                # for future use
+                if entry.endswith(".gz") and entry[:-3] not in uncompnotseen.keys():
+                    uncompnotseen[filename[:-3]] = (gzip.GzipFile, filename)
+                elif entry.endswith(".bz2") and entry[:-4] not in uncompnotseen.keys():
+                    uncompnotseen[filename[:-4]] = (bz2.BZ2File, filename)
+
+                fileinfo[filename]['len'] = len(contents)
+
+                for hf, func in hashfuncs.items():
+                    fileinfo[filename][hf] = func(contents)
+
+        for filename, comp in uncompnotseen.items():
+            # If we've already seen the uncompressed file, we don't
+            # need to do anything again
+            if filename in fileinfo.keys():
+                continue
+
+            # Skip uncompressed Contents files as they're huge, take ages to
+            # checksum and we checksum the compressed ones anyways
+            if os.path.basename(filename).startswith("Contents"):
+                continue
+
+            fileinfo[filename] = {}
+
+            # File handler is comp[0], filename of compressed file is comp[1]
+            contents = comp[0](comp[1], 'r').read()
+
+            fileinfo[filename]['len'] = len(contents)
+
+            for hf, func in hashfuncs.items():
+                fileinfo[filename][hf] = func(contents)
+
+
+        for h in sorted(hashfuncs.keys()):
+            out.write('%s:\n' % h)
+            for filename in sorted(fileinfo.keys()):
+                out.write(" %s %8d %s\n" % (fileinfo[filename][h], fileinfo[filename]['len'], filename))
+
+        out.close()
+
+        sign_release_dir(os.path.dirname(outfile))
+
+        os.chdir(oldcwd)
+
+        return
 
-################################################################################
 
 def main ():
-    global Cnf, AptCnf, out
-    out = sys.stdout
+    global Logger, results
 
-    Cnf = utils.get_conf()
     cnf = Config()
 
+    for i in ["Help", "Suite", "Force"]:
+        if not cnf.has_key("Generate-Releases::Options::%s" % (i)):
+            cnf["Generate-Releases::Options::%s" % (i)] = ""
+
     Arguments = [('h',"help","Generate-Releases::Options::Help"),
-                 ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"),
-                 ('f',"force-touch","Generate-Releases::Options::Force-Touch"),
-                ]
-    for i in [ "help", "apt-conf", "force-touch" ]:
-        if not Cnf.has_key("Generate-Releases::Options::%s" % (i)):
-            Cnf["Generate-Releases::Options::%s" % (i)] = ""
+                 ('s',"suite","Generate-Releases::Options::Suite"),
+                 ('f',"force","Generate-Releases::Options::Force")]
 
-    suites = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    Options = Cnf.SubTree("Generate-Releases::Options")
+    suite_names = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.SubTree("Generate-Releases::Options")
 
     if Options["Help"]:
         usage()
 
-    if not Options["Apt-Conf"]:
-        Options["Apt-Conf"] = utils.which_apt_conf_file()
-
-    AptCnf = apt_pkg.newConfiguration()
-    apt_pkg.ReadConfigFileISC(AptCnf, Options["Apt-Conf"])
+    Logger = daklog.Logger(cnf, 'generate-releases')
 
-    if not suites:
-        suites = Cnf.SubTree("Suite").List()
+    session = DBConn().session()
 
-    for suitename in suites:
-        print "Processing: " + suitename
-        SuiteBlock = Cnf.SubTree("Suite::" + suitename)
-        suiteobj = get_suite(suitename.lower())
-        if not suiteobj:
-            print "ALERT: Cannot find suite %s!" % (suitename.lower())
-            continue
+    if Options["Suite"]:
+        suites = []
+        for s in suite_names:
+            suite = get_suite(s.lower(), session)
+            if suite:
+                suites.append(suite)
+            else:
+                print "cannot find suite %s" % s
+                Logger.log(['cannot find suite %s' % s])
+    else:
+        suites = session.query(Suite).filter(Suite.untouchable == False).all()
 
-        # Use the canonical name
-        suite = suiteobj.suite_name.lower()
+    broken=[]
+    # For each given suite, run one process
+    results = []
 
-        if suiteobj.untouchable and not Options["Force-Touch"]:
-            print "Skipping: " + suite + " (untouchable)"
-            continue
+    pool = Pool()
 
-        origin = suiteobj.origin
-        label = suiteobj.label or suiteobj.origin
-        codename = suiteobj.codename or ""
-        version = ""
-        if suiteobj.version and suiteobj.version != '-':
-            version = suiteobj.version
-        description = suiteobj.description or ""
-
-        architectures = get_suite_architectures(suite, skipall=True, skipsrc=True)
-
-        if suiteobj.notautomatic:
-            notautomatic = "yes"
-        else:
-            notautomatic = ""
-
-        if suiteobj.butautomaticupgrades:
-            butautomaticupgrades = "yes"
-        else:
-            butautomaticupgrades = ""
-
-        if SuiteBlock.has_key("Components"):
-            components = SuiteBlock.ValueList("Components")
-        else:
-            components = []
-
-        suite_suffix = Cnf.Find("Dinstall::SuiteSuffix")
-        if components and suite_suffix:
-            longsuite = suite + "/" + suite_suffix
-        else:
-            longsuite = suite
-
-        tree = SuiteBlock.get("Tree", "dists/%s" % (longsuite))
-
-        if AptCnf.has_key("tree::%s" % (tree)):
-            pass
-        elif AptCnf.has_key("bindirectory::%s" % (tree)):
-            pass
-        else:
-            aptcnf_filename = os.path.basename(utils.which_apt_conf_file())
-            print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
+    for s in suites:
+        # Setup a multiprocessing Pool. As many workers as we have CPU cores.
+        if s.untouchable and not Options["Force"]:
+            print "Skipping %s (untouchable)" % s.suite_name
             continue
 
-        print Cnf["Dir::Root"] + tree + "/Release"
-        out = open(Cnf["Dir::Root"] + tree + "/Release", "w")
+        print "Processing %s" % s.suite_name
+        Logger.log(['Processing release file for Suite: %s' % (s.suite_name)])
+        pool.apply_async(generate_helper, (s.suite_id, ), callback=get_result)
 
-        out.write("Origin: %s\n" % (suiteobj.origin))
-        out.write("Label: %s\n" % (label))
-        out.write("Suite: %s\n" % (suite))
-        if version != "":
-            out.write("Version: %s\n" % (version))
-        if codename != "":
-            out.write("Codename: %s\n" % (codename))
-        out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
+    # No more work will be added to our pool, close it and then wait for all to finish
+    pool.close()
+    pool.join()
 
-        if suiteobj.validtime:
-            validtime=float(suiteobj.validtime)
-            out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+validtime))))
+    retcode = 0
 
-        if notautomatic != "":
-            out.write("NotAutomatic: %s\n" % (notautomatic))
-        if butautomaticupgrades != "":
-            out.write("ButAutomaticUpgrades: %s\n" % (butautomaticupgrades))
-        out.write("Architectures: %s\n" % (" ".join([a.arch_string for a in architectures])))
-        if components:
-            out.write("Components: %s\n" % (" ".join(components)))
+    if len(results) > 0:
+        Logger.log(['Release file generation broken: %s' % (results)])
+        print "Release file generation broken:\n", '\n'.join(results)
+        retcode = 1
 
-        if description:
-            out.write("Description: %s\n" % (description))
+    Logger.close()
 
-        files = []
+    sys.exit(retcode)
 
-        if AptCnf.has_key("tree::%s" % (tree)):
-            if AptCnf.has_key("tree::%s::Contents" % (tree)):
-                pass
-            else:
-                for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)):
-                    if x.startswith('Contents-'):
-                        if x.endswith('.diff'):
-                            files.append("%s/Index" % (x))
-                        else:
-                            files.append(x)
-
-            for sec in AptCnf["tree::%s::Sections" % (tree)].split():
-                for arch in AptCnf["tree::%s::Architectures" % (tree)].split():
-                    if arch == "source":
-                        filepath = "%s/%s/Sources" % (sec, arch)
-                        for cfile in compressnames("tree::%s" % (tree), "Sources", filepath):
-                            files.append(cfile)
-                        add_tiffani(files, Cnf["Dir::Root"] + tree, filepath)
-                    else:
-                        installer = "%s/installer-%s" % (sec, arch)
-                        installerpath = Cnf["Dir::Root"]+tree+"/"+installer
-                        if os.path.exists(installerpath):
-                            for directory in os.listdir(installerpath):
-                                if os.path.exists("%s/%s/images/MD5SUMS" % (installerpath, directory)):
-                                    files.append("%s/%s/images/MD5SUMS" % (installer, directory))
-
-                        filepath = "%s/binary-%s/Packages" % (sec, arch)
-                        for cfile in compressnames("tree::%s" % (tree), "Packages", filepath):
-                            files.append(cfile)
-                        add_tiffani(files, Cnf["Dir::Root"] + tree, filepath)
-
-                    if arch == "source":
-                        rel = "%s/%s/Release" % (sec, arch)
-                    else:
-                        rel = "%s/binary-%s/Release" % (sec, arch)
-                    relpath = Cnf["Dir::Root"]+tree+"/"+rel
-                    write_release_file(relpath, suite, sec, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades)
-                    files.append(rel)
-                gen_i18n_index(files, tree, sec)
-
-            if AptCnf.has_key("tree::%s/main" % (tree)):
-                for dis in ["main", "contrib", "non-free"]:
-                    if not AptCnf.has_key("tree::%s/%s" % (tree, dis)): continue
-                    sec = AptCnf["tree::%s/%s::Sections" % (tree,dis)].split()[0]
-                    if sec != "debian-installer":
-                        print "ALERT: weird non debian-installer section in %s" % (tree)
-
-                    for arch in AptCnf["tree::%s/%s::Architectures" % (tree,dis)].split():
-                        if arch != "source":  # always true
-                            rel = "%s/%s/binary-%s/Release" % (dis, sec, arch)
-                            relpath = Cnf["Dir::Root"]+tree+"/"+rel
-                            write_release_file(relpath, suite, dis, origin, label, arch, version, suite_suffix, notautomatic, butautomaticupgrades)
-                            files.append(rel)
-                            for cfile in compressnames("tree::%s/%s" % (tree,dis),
-                                "Packages",
-                                "%s/%s/binary-%s/Packages" % (dis, sec, arch)):
-                                files.append(cfile)
-            elif AptCnf.has_key("tree::%s::FakeDI" % (tree)):
-                usetree = AptCnf["tree::%s::FakeDI" % (tree)]
-                sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0]
-                if sec != "debian-installer":
-                    print "ALERT: weird non debian-installer section in %s" % (usetree)
-
-                for arch in AptCnf["tree::%s/main::Architectures" % (usetree)].split():
-                    if arch != "source":  # always true
-                        for cfile in compressnames("tree::%s/main" % (usetree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)):
-                            files.append(cfile)
-
-        elif AptCnf.has_key("bindirectory::%s" % (tree)):
-            for cfile in compressnames("bindirectory::%s" % (tree), "Packages", AptCnf["bindirectory::%s::Packages" % (tree)]):
-                files.append(cfile.replace(tree+"/","",1))
-            for cfile in compressnames("bindirectory::%s" % (tree), "Sources", AptCnf["bindirectory::%s::Sources" % (tree)]):
-                files.append(cfile.replace(tree+"/","",1))
-        else:
-            print "ALERT: no tree/bindirectory for %s" % (tree)
-
-        for hashvalue in cnf.SubTree("Generate-Releases").List():
-            if suite in [ i.lower() for i in cnf.ValueList("Generate-Releases::%s" % (hashvalue)) ]:
-                out.write("%s:\n" % (hashvalue))
-                print_hash_files(tree, files, hashvalue)
+def generate_helper(suite_id):
+    '''
+    This function is called in a new subprocess.
+    '''
+    session = DBConn().session()
+    suite = Suite.get(suite_id, session)
+    try:
+        rw = ReleaseWriter(suite)
+        rw.generate_release_files()
+    except Exception, e:
+        return str(e)
 
-        out.close()
-        if Cnf.has_key("Dinstall::SigningKeyring"):
-            keyring = "--secret-keyring \"%s\"" % Cnf["Dinstall::SigningKeyring"]
-            if Cnf.has_key("Dinstall::SigningPubKeyring"):
-                keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"]
-
-            arguments = "--no-options --batch --no-tty --armour"
-            signkeyids=cnf.signingkeyids.split()
-
-            dest = Cnf["Dir::Root"] + tree + "/Release.gpg"
-            if os.path.exists(dest):
-                os.unlink(dest)
-            inlinedest = Cnf["Dir::Root"] + tree + "/InRelease"
-            if os.path.exists(inlinedest):
-                os.unlink(inlinedest)
-
-            for keyid in signkeyids:
-                if keyid != "":
-                    defkeyid = "--default-key %s" % keyid
-                else:
-                    defkeyid = ""
-                os.system("gpg %s %s %s --detach-sign <%s >>%s" %
-                        (keyring, defkeyid, arguments,
-                        Cnf["Dir::Root"] + tree + "/Release", dest))
-                os.system("gpg %s %s %s --clearsign <%s >>%s" %
-                        (keyring, defkeyid, arguments,
-                        Cnf["Dir::Root"] + tree + "/Release", inlinedest))
+    return
 
 #######################################################################################
 
index 8b5b57fe2ef2db0cf2b1a882ad7aa30615eb3422..563a89812b8938463fc9c68a85dcee54a04c863e 100755 (executable)
@@ -28,7 +28,7 @@ from daklib import utils
 def main():
     Cnf = utils.get_conf()
     count = 0
-    move_date = int(time.time())-(30*84600)
+    move_date = int(time.time())
     os.chdir(Cnf["Dir::Queue::Done"])
     files = glob.glob("%s/*" % (Cnf["Dir::Queue::Done"]))
     for filename in files:
index 9724820283f75bb91ae74d8e13dbde0a5705b466..9051704b406ba6140480ee3b8abad23dc1a90d8a 100755 (executable)
@@ -46,7 +46,7 @@ from daklib.daklog import Logger
 ################################################################################
 
 Cnf = None
-required_database_schema = 51
+required_database_schema = 52
 
 ################################################################################
 
index 47e2b130645fd582df973432bf33cb4c6d7bb04d..fe04ebc3df4c90e1f1bf13a4c0ddb3966bab3d1c 100755 (executable)
@@ -3027,6 +3027,33 @@ __all__.append('SourceMetadata')
 
 ################################################################################
 
+class VersionCheck(ORMObject):
+    def __init__(self, *args, **kwargs):
+       pass
+
+    def properties(self):
+        #return ['suite_id', 'check', 'reference_id']
+        return ['check']
+
+    def not_null_constraints(self):
+        return ['suite', 'check', 'reference']
+
+__all__.append('VersionCheck')
+
+@session_wrapper
+def get_version_checks(suite_name, check = None, session = None):
+    suite = get_suite(suite_name, session)
+    if not suite:
+        return None
+    q = session.query(VersionCheck).filter_by(suite=suite)
+    if check:
+        q = q.filter_by(check=check)
+    return q.all()
+
+__all__.append('get_version_checks')
+
+################################################################################
+
 class DBConn(object):
     """
     database module init.
@@ -3092,6 +3119,7 @@ class DBConn(object):
             'suite_src_formats',
             'uid',
             'upload_blocks',
+            'version_check',
         )
 
         views = (
@@ -3406,6 +3434,13 @@ class DBConn(object):
                 key = relation(MetadataKey),
                 value = self.tbl_source_metadata.c.value))
 
+       mapper(VersionCheck, self.tbl_version_check,
+           properties = dict(
+               suite_id = self.tbl_version_check.c.suite,
+               suite = relation(Suite, primaryjoin=self.tbl_version_check.c.suite==self.tbl_suite.c.id),
+               reference_id = self.tbl_version_check.c.reference,
+               reference = relation(Suite, primaryjoin=self.tbl_version_check.c.reference==self.tbl_suite.c.id, lazy='joined')))
+
     ## Connection functions
     def __createconn(self):
         from config import Config
index 213dbd58cc6f3a1b1c66d3b6adff814d865d9a62..b7eba9537aba8fbabb8883cb0e9c4a9726af47b2 100755 (executable)
@@ -2517,7 +2517,7 @@ distribution."""
         """
         Cnf = Config()
         anyversion = None
-        anysuite = [suite] + Cnf.ValueList("Suite::%s::VersionChecks::Enhances" % (suite))
+        anysuite = [suite] + [ vc.reference.suite_name for vc in get_version_checks(suite, "Enhances") ]
         for (s, v) in sv_list:
             if s in [ x.lower() for x in anysuite ]:
                 if not anyversion or apt_pkg.VersionCompare(anyversion, v) <= 0:
@@ -2547,8 +2547,8 @@ distribution."""
 
         # Check versions for each target suite
         for target_suite in self.pkg.changes["distribution"].keys():
-            must_be_newer_than = [ i.lower() for i in cnf.ValueList("Suite::%s::VersionChecks::MustBeNewerThan" % (target_suite)) ]
-            must_be_older_than = [ i.lower() for i in cnf.ValueList("Suite::%s::VersionChecks::MustBeOlderThan" % (target_suite)) ]
+            must_be_newer_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeNewerThan") ]
+            must_be_older_than = [ vc.reference.suite_name for vc in get_version_checks(target_suite, "MustBeOlderThan") ]
 
             # Enforce "must be newer than target suite" even if conffile omits it
             if target_suite not in must_be_newer_than:
index 62b8ac2e7625701a7f781f32ec85abfaf3f727da..47e6ab2c9f255402d23878eccfb0be903abf1761 100755 (executable)
@@ -124,3 +124,7 @@ re_parse_lintian = re.compile(r"^(?P<level>W|E|O): (?P<package>.*?): (?P<tag>[^
 
 # in process-upload
 re_match_expired = re.compile(r"^The key used to sign .+ has expired on .+$")
+
+# in generate-releases
+re_gensubrelease = re.compile (r".*/(binary-[0-9a-z-]+|source)$")
+re_includeinrelease = re.compile (r"(Contents-[0-9a-z-]+.gz|Index|Packages(.gz|.bz2)?|Sources(.gz|.bz2)?|MD5SUMS|Release)$")