Merge with mainline.

diff --git a/ChangeLog b/ChangeLog
index f903de146c9fabd84a7b73f4e243445615336413..5f347bbb08e281ca5213ef89b2890c30ae126bb9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2006-06-26  Ryan Murray  <rmurray@debian.org>
+
+       * dak/process_unchecked.py (check_files): strip optional source version
+       from Source: field in changes file, and ensure what is left is a valid
+       package name.
+
+2006-06-23  Ryan Murray  <rmurray@debian.org>
+
+       * dak/process_unchecked.py (check_files): also check ProposedUpdates
+       queue for source.
+
+2006-06-18  Ryan Murray  <rmurray@debian.org>
+
+       * dak/scripts/debian/update-ftpstats: look for dak named processes in
+       the log, too.
+
+       * dak/process_unchecked.py (check_files): only check embargoed and
+       unembargoed queues if the keys are set.
+
+       * dak/config/debian-security/apt.conf: set Packages::Compress to gzip
+       and bzip2 for etch.
+
 2006-06-16  James Troup  <james@nocrew.org>
 
        * dak/dak.py (init): add new-security-install.

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 6d286cd18fac687e4bcf0ec53435622061768783..a231affe8f7546768919cd5d5265a9cf436053f6 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -47,4 +47,6 @@ tree "dists/testing/updates"
    ExtraOverride "override.etch.extra.$(SECTION)";
    SrcOverride "override.etch.$(SECTION).src";
    Contents " ";
+   Packages::Compress "gzip bzip2";
+   Sources::Compress "gzip bzip2";
 };

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 300d559da33e57d79eaaae2ef52295c372f08df3..564a758ca5a28f49a444b45ee7fec3256c25ae35 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -42,7 +42,7 @@ tree "dists/testing"
    BinOverride "override.etch.$(SECTION)";
    ExtraOverride "override.etch.extra.$(SECTION)";
    SrcOverride "override.etch.$(SECTION).src";
-   Packages::Compress "gzip bzip2";
+   Packages::Compress ". gzip bzip2";
    Sources::Compress "gzip bzip2";
 };
 
@@ -67,7 +67,7 @@ tree "dists/unstable"
    BinOverride "override.sid.$(SECTION)";
    ExtraOverride "override.sid.extra.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
-   Packages::Compress "gzip bzip2";
+   Packages::Compress ". gzip bzip2";
    Sources::Compress "gzip bzip2";
 };
 

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 1282b60e8700143fd7de77a6ab7ffaf9c07fea3e..7eddf086884286c2374afec91e33c1aca4c1b0ad 100644 (file)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -43,7 +43,7 @@ if lockfile -r3 $LOCKFILE; then
                                fi
                        done
                        cd $configdir
-                       apt-ftparchive -qq generate apt.conf.buildd
+                       apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
                        . $configdir/cron.buildd
                fi
        else

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 665528a7c32d530fc7be4e2a129f497a5729be60..688fd63c273363b407d96c56f655c09c68ec1ba7 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -43,6 +43,7 @@ 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+\)$")
 
 ################################################################################
 
@@ -202,6 +203,14 @@ def check_changes():
             reject("%s: Missing mandatory field `%s'." % (filename, i))
             return 0    # Avoid <undef> errors during later tests
 
+    # Strip a source version in brackets from the source field
+    if re_strip_srcver.search(changes["source"]):
+       changes["source"] = re_strip_srcver.sub('', changes["source"])
+
+    # Ensure the source field is a valid package name.
+    if not re_valid_pkg_name.match(changes["source"]):
+        reject("%s: invalid source name '%s'." % (filename, changes["source"]))
+
     # Split multi-value fields into a lower-level dictionary
     for i in ("architecture", "distribution", "binary", "closes"):
         o = changes.get(i, "")
@@ -531,10 +540,11 @@ def check_files():
                         files[file]["new"] = 1
                     else:
                        dsc_file_exists = 0
-                        for myq in ["Accepted", "Embargoed", "Unembargoed"]:
-                            if os.path.exists(Cnf["Dir::Queue::"+myq] + '/' + dsc_filename):
-                               dsc_file_exists = 1
-                               break
+                        for myq in ["Accepted", "Embargoed", "Unembargoed", "ProposedUpdates"]:
+                           if Cnf.has_key("Dir::Queue::%s" % (myq)):
+                               if os.path.exists(Cnf["Dir::Queue::"+myq] + '/' + dsc_filename):
+                                   dsc_file_exists = 1
+                                   break
                        if not dsc_file_exists:
                             reject("no source found for %s %s (%s)." % (source_package, source_version, file))
             # Check the version and for file overwrites

diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats
index 6627fff900df2ea8096daa7e06f0c6a84dfcc7d6..17a47cb16f9eb3a4a9f289ff6537687a8c642299 100755 (executable)
--- a/scripts/debian/update-ftpstats
+++ b/scripts/debian/update-ftpstats
@@ -7,7 +7,7 @@ my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "hppa",
        "sparc");
 
 while (<>) {
-       if (/^(\d{8})\d{6}\|k(?:atie|elly)\|installed\|[^|]+\|[^|]+\|(\d+)\|([-\w]+)$/) {
+       if (/^(\d{8})\d{6}\|(?:k(?:atie|elly)|process-accepted)\|installed\|[^|]+\|[^|]+\|(\d+)\|([-\w]+)$/) {
                if (not defined $data{$1}) {
                        foreach $a (@archs) {
                                $data{$1}{$a} = 0;