handle different error message from newer python-apt

diff --git a/ChangeLog b/ChangeLog
index cf8604f8f1a4b0441998fb5bb2d8c377dfb280f7..fde0a7013bafeb6b9c02fa8cfa3ef57611d83b80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,11 @@
        to configure per suite/component/architecture binary upload
        restrictions.
 
+2006-10-09  James Troup  <james.troup@canonical.com>
+
+       * dak/process_unchecked.py (check_timestamps): change match to
+       search as recent versions of python-apt prefix the string with 'E: '.
+
 2006-06-26  Ryan Murray  <rmurray@debian.org>
 
        * dak/process_unchecked.py (check_files): strip optional source version

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index df2e7a35c63fe7fbe001a39ad7d138846603b8be..66d3feff52856c11e2a2a7fbb116e9dc6b166ad4 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -987,7 +987,7 @@ def check_timestamps():
                     apt_inst.debExtract(deb_file,tar.callback,"data.tar.gz")
                 except SystemError, e:
                     # If we can't find a data.tar.gz, look for data.tar.bz2 instead.
-                    if not re.match(r"Cannot f[ui]nd chunk data.tar.gz$", str(e)):
+                    if not re.search(r"Cannot f[ui]nd chunk data.tar.gz$", str(e)):
                         raise
                     deb_file.seek(0)
                     apt_inst.debExtract(deb_file,tar.callback,"data.tar.bz2")