From: Kurt Roeckx Date: Sat, 22 May 2010 11:04:47 +0000 (+0000) Subject: Merge branch 'master' of /srv/buildd.debian.org/git/wanna-build X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=66ac3de4254b2f5cecd19a4b533e40116db60844;hp=5769e5eea5d3a54f50d3a5a358a372d861d77f4c;p=wannabuild.git Merge branch 'master' of /srv/buildd.debian.org/git/wanna-build --- diff --git a/expire_dumps b/expire_dumps index 2530b3d..610cd46 100755 --- a/expire_dumps +++ b/expire_dumps @@ -58,8 +58,8 @@ def all_files(pattern, search_path, pathsep=os.pathsep): def parse_file_dates_pre(list): out = [] - # dump_2006.05.02-11:52:01.bz2 - p = re.compile('^\./dump_pre_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.bz2)?$') + # dump_2006.05.02-11:52:01.gz + p = re.compile('^\./dump_pre_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.gz)?$') for file in list: m = p.search(file) if m: @@ -69,8 +69,8 @@ def parse_file_dates_pre(list): def parse_file_dates_post(list): out = [] - # dump_2006.05.02-11:52:01.bz2 - p = re.compile('^\./dump_post_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.bz2)?$') + # dump_2006.05.02-11:52:01.gz + p = re.compile('^\./dump_post_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.gz)?$') for file in list: m = p.search(file) if m: