X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fexpire_dumps;h=b7b20655da25baa7d07798163987fb6ba8ba709c;hb=555ead275da590d2325c2fa4ef2652547100d72b;hp=b09f88dd00fb6804a6e8e467bc1803546430ca31;hpb=3de21bfb588537661d127b8560342b65fccd55cf;p=dak.git

diff --git a/scripts/debian/expire_dumps b/scripts/debian/expire_dumps
index b09f88dd..b7b20655 100755
--- a/scripts/debian/expire_dumps
+++ b/scripts/debian/expire_dumps
@@ -33,13 +33,14 @@ from optparse import OptionParser
 
 RULES = [
     {'days':14,   'interval':0},
-    {'days':31,   'interval':1},
+    {'days':31,   'interval':7},
     {'days':365,  'interval':31},
     {'days':3650, 'interval':365},
 
     # keep 14 days, all each day
     # keep 31 days, 1 each 7th day
     # keep 365 days, 1 each 31th day
+    # keep 3650 days, 1 each 365th day
 ]
 
 TODAY = datetime.today()
@@ -58,7 +59,7 @@ def all_files(pattern, search_path, pathsep=os.pathsep):
 def parse_file_dates(list):
     out = []
     # dump_2006.05.02-11:52:01.bz2
-    p = re.compile('^\./dump_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.bz2)?$')
+    p = re.compile('^\./dump_([0-9]{4})\.([0-9]{2})\.([0-9]{2})-([0-9]{2}):([0-9]{2}):([0-9]{2})(.xz)?$')
     for file in list:
         m = p.search(file)
         if m: