make-changelog: only consider latest sources in suites

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 5d7f007ba8e162c93791f32032cd3301e874ffdd..4004662035ceb9abd89fa034bceab82c864537f4 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -36,6 +36,7 @@ import apt_pkg
 from daklib import utils
 from daklib.dak_exceptions import *
 from daklib.dbconn import *
+from daklib.config import Config
 
 ################################################################################
 
@@ -134,6 +135,9 @@ def print_md5sha_files (tree, files, hashop):
 
         except CantOpenError:
             print "ALERT: Couldn't open " + path + name
+        except IOError:
+            print "ALERT: IOError when reading %s" % (path + name)
+            raise
         else:
             out.write(" %s %8d %s\n" % (hashvalue, hashlen, name))
 
@@ -178,6 +182,7 @@ def main ():
     out = sys.stdout
 
     Cnf = utils.get_conf()
+    cnf = Config()
 
     Arguments = [('h',"help","Generate-Releases::Options::Help"),
                  ('a',"apt-conf","Generate-Releases::Options::Apt-Conf", "HasArg"),
@@ -371,7 +376,7 @@ def main ():
                 keyring += " --keyring \"%s\"" % Cnf["Dinstall::SigningPubKeyring"]
 
             arguments = "--no-options --batch --no-tty --armour"
-            signkeyids=Cnf.signingkeyids.split()
+            signkeyids=cnf.signingkeyids.split()
 
             dest = Cnf["Dir::Root"] + tree + "/Release.gpg"
             if os.path.exists(dest):