From: Ryan Murray <rmurray@debian.org>
Date: Fri, 23 Jun 2006 08:51:34 +0000 (-0700)
Subject: gzip and bzip2 for etch on security, security merge fix, security uploads to p-u
X-Git-Tag: debian-r/squeeze~1648
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f25d894cf1d8db4d64a04d990531700616a45074;p=dak.git

gzip and bzip2 for etch on security, security merge fix, security uploads to p-u
fix, and stats fix.
---

diff --git a/ChangeLog b/ChangeLog
index f903de14..fd2f9c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+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 6d286cd1..a231affe 100644
--- 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/dak/process_unchecked.py b/dak/process_unchecked.py
index 36b091f2..9b1b4867 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -531,10 +531,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 6627fff9..17a47cb1 100755
--- 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;