From: James Troup Date: Tue, 13 Feb 2007 12:51:56 +0000 (+0000) Subject: handle different error message from newer python-apt X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a734b163f848303ae36fb9d6c58e6e9ba62e9256;p=dak handle different error message from newer python-apt --- diff --git a/ChangeLog b/ChangeLog index cf8604f8..fde0a701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -56,6 +56,11 @@ to configure per suite/component/architecture binary upload restrictions. +2006-10-09 James Troup + + * 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 * dak/process_unchecked.py (check_files): strip optional source version diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index df2e7a35..66d3feff 100755 --- 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")