X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=b0954fe03346460704f7580baa13555cfd1c8309;hb=87c987bfba1f8401a3ac93e52d39ed23eddc0db3;hp=11e37807121181c892bca57ab40471fec5674969;hpb=1c35448b880358d020e81339657e3435fdda9434;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 11e37807..b0954fe0 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
 
-""" Create all the Release files """
-
-# Copyright (C) 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
+""" Create all the Release files
 
+@contact: Debian FTPMaster <ftpmaster@debian.org>
+@Copyright: 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
+@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@license: GNU General Public License version 2 or later
+"""
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -22,8 +25,12 @@
 
 ################################################################################
 
-import sys, os, stat, time
-import gzip, bz2
+import sys
+import os
+import stat
+import time
+import gzip
+import bz2
 import apt_pkg
 
 from daklib import utils
@@ -197,22 +204,26 @@ def main ():
 
     for suitename in suites:
         print "Processing: " + suitename
-        SuiteBlock = Cnf.SubTree("Suite::" + suite)
-        suiteobj = get_suite(suitename)
+        SuiteBlock = Cnf.SubTree("Suite::" + suitename)
+        suiteobj = get_suite(suitename.lower())
+        if not suiteobj:
+            print "ALERT: Cannot find suite %s!" % (suitename.lower())
+            continue
 
-        suite = suite.suite_name.lower()
+        # Use the canonical name
+        suite = suiteobj.suite_name.lower()
 
-        if suite.untouchable and not Options["Force-Touch"]:
+        if suiteobj.untouchable and not Options["Force-Touch"]:
             print "Skipping: " + suite + " (untouchable)"
             continue
 
-        origin = suite.origin
-        label = suite.label or suite.origin
-        codename = suite.codename or ""
+        origin = suiteobj.origin
+        label = suiteobj.label or suiteobj.origin
+        codename = suiteobj.codename or ""
         version = ""
-        if suite.version and suite.version != '-':
-            version = suite.version
-        description = suite.description or ""
+        if suiteobj.version and suiteobj.version != '-':
+            version = suiteobj.version
+        description = suiteobj.description or ""
 
         architectures = get_suite_architectures(suite, skipall=True, skipsrc=True)