Merge commit 'allan/bugfixes' into merge

* commit 'allan/bugfixes':
  Check for the existance of the function before trying to drop it.
  Added mention of groups required by update11.py
  Fixed missing DBUpdateError imports.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/common b/config/debian/common
index 5c8171ed6888b920124cf2c14eb0525ef3650d59..9bc417b7bb91918fa45594847bb7d42220cda979 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -57,7 +57,6 @@ function acceptnew () {
                 mv --target-directory="${accepted}" "${NAME}"
             else
                 log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
-                exit 2
             fi
         done
         mv --target-directory="${accepted}"  "${file}" "${file%%.changes}.dak"

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index c239c09c97499c7a119031bef4271ea960645302..edd6f6c6f13c2e3cb851d07b0f3b9a72b633139c 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -354,12 +354,12 @@ function compress() {
     cd $base/backup/
     find -maxdepth 1 -mindepth 1 -type f -name 'dump_pre_*' -mtime +2 -print0 | xargs -0 --no-run-if-empty rm
 
-    find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mmin 720 |
+    find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' -mmin +720 |
     while read dumpname; do
         echo "Compressing $dumpname"
         bzip2 -9v "$dumpname"
     done
-    find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' -mmin 720 |
+    find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' -mmin +720 |
     while read dumpname; do
         echo "Compressing $dumpname"
         bzip2 -9v "$dumpname"

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index cbd4f225f18c7886e2054a9b1290d456a547bd18..ee12e769e4742c7d4802aa5b79f433af4c429cc6 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -315,6 +315,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
          };
 //       MustBeOlderThan
@@ -377,6 +378,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -438,6 +440,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;
@@ -472,6 +475,7 @@ Suite
        {
          MustBeNewerThan
          {
+           OldStable;
            Stable;
 //         Proposed-Updates;
            Testing;

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 291472215ddfe51f991f2a4233d96843f975e0c5..748a3be4afe5815aa7bad922cbbd28c548d298ff 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -453,7 +453,7 @@ def get_readme_source (dsc_filename):
     if os.path.exists(path):
         res += do_command("cat", path)
     else:
-        res += "No README.source in this package"
+        res += "No README.source in this package\n\n"
 
     try:
         shutil.rmtree(tempdir)

diff --git a/dak/process_new.py b/dak/process_new.py
index d631b53aa7b90f67b6dd4d4537e4063efde90c82..f8a6f40e86288d93c09f209b5a07aee9d95cceeb 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -101,7 +101,7 @@ def recheck():
                 source_epochless_version = re_no_epoch.sub('', source_version)
                 dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version)
                 found = 0
-                for q in ["Accepted", "Embargoed", "Unembargoed"]:
+                for q in ["Accepted", "Embargoed", "Unembargoed", "Newstage"]:
                     if Cnf.has_key("Dir::Queue::%s" % (q)):
                         if os.path.exists(Cnf["Dir::Queue::%s" % (q)] + '/' + dsc_filename):
                             found = 1

diff --git a/daklib/regexes.py b/daklib/regexes.py
index ee26430ce8673b1908b5a948cce877898328e4f7..6fd0c81d0955ae4bbe8dc3f94aa9aab815891675 100755 (executable)
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -35,6 +35,7 @@ re_fdnic = re.compile(r"\n\n")
 re_bin_only_nmu = re.compile(r"\+b\d+$")
 
 re_comments = re.compile(r"\#.*")
+re_whitespace_comment = re.compile(r"^\s*(#|$)")
 re_no_epoch = re.compile(r"^\d+\:")
 re_no_revision = re.compile(r"-[^-]+$")
 re_arch_from_filename = re.compile(r"/binary-[^/]+/")

diff --git a/daklib/utils.py b/daklib/utils.py
index c40fe8e0efafcde03c217151f647c1a1672e3f97..951270b5d2074fc380cfaba696d16b4d56bb010d 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -43,7 +43,8 @@ import email as modemail
 from dak_exceptions import *
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                     re_multi_line_field, re_srchasver, re_verwithext, \
-                    re_parse_maintainer, re_taint_free, re_gpg_uid, re_re_mark
+                    re_parse_maintainer, re_taint_free, re_gpg_uid, re_re_mark, \
+                    re_whitespace_comment
 
 ################################################################################
 
@@ -616,10 +617,11 @@ def send_mail (message, filename=""):
         whitelist_in = open_file(Cnf["Dinstall::MailWhiteList"])
         try:
             for line in whitelist_in:
-                if re_re_mark.match(line):
-                    whitelist.append(re.compile(re_re_mark.sub("", line.strip(), 1)))
-                else:
-                    whitelist.append(re.compile(re.escape(line.strip())))
+                if not re_whitespace_comment.match(line):
+                    if re_re_mark.match(line):
+                        whitelist.append(re.compile(re_re_mark.sub("", line.strip(), 1)))
+                    else:
+                        whitelist.append(re.compile(re.escape(line.strip())))
         finally:
             whitelist_in.close()