X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fgenerate_releases.py;h=543532fdfdf0057f97bfeac809b59789d8ee4372;hb=ab2b2a7d6bd2ebf97136f0cc2cb9f815db517418;hp=cb82a9472f3317d48fad71a548ad6774b240ebe8;hpb=9678ddd39550f29a651ca1065dc0b4444e16d636;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index cb82a947..543532fd 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -24,7 +24,8 @@
 
 import sys, os, popen2, tempfile, stat, time, pg
 import apt_pkg
-import daklib.utils as utils
+from daklib import utils
+from daklib.dak_exceptions import *
 
 ################################################################################
 
@@ -107,7 +108,7 @@ def print_md5sha_files (tree, files, hashop):
             else:
                 size = os.stat(path + name)[stat.ST_SIZE]
                 file_handle = utils.open_file(path + name)
-        except utils.cant_open_exc:
+        except CantOpenError:
             print "ALERT: Couldn't open " + path + name
         else:
             hash = hashop(file_handle)
@@ -217,6 +218,7 @@ def main ():
         if codename != "":
             out.write("Codename: %s\n" % (codename))
         out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
+        out.write("Valid-Until: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()+7*24*60*60))))
         if notautomatic != "":
             out.write("NotAutomatic: %s\n" % (notautomatic))
         out.write("Architectures: %s\n" % (" ".join(filter(utils.real_arch, SuiteBlock.ValueList("Architectures")))))