X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=aac33d234662ac6831bc89219169740490467d67;hb=d6a3cba61d435c2aff711106d6cb3e111c0cb556;hp=df2e7a35c63fe7fbe001a39ad7d138846603b8be;hpb=6e6fbf1d68ed68b0ee047858e1375f50697c1eb1;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index df2e7a35..aac33d23 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") @@ -1244,7 +1244,7 @@ def is_stableupdate (): return 0 if not changes["architecture"].has_key("source"): - pusuite = database.get_suite_id("proposed-updates") + pusuite = daklib.database.get_suite_id("proposed-updates") q = Upload.projectB.query( "SELECT S.source FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = '%s' AND s.version = '%s' AND sa.suite = %d" % (changes["source"], changes["version"], pusuite))