Merge commit 'ftpmaster/master'

[dak.git] / dak / generate_index_diffs.py

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 724a225f6d2cb095e91fd1f954741dce338161c0..4222c0cf4fb9446b0bc19a7127dab4e9fe4da24e 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -34,12 +34,11 @@
 import sys
 import os
 import tempfile
-import subprocess
 import time
 import apt_pkg
 
 from daklib import utils
-from daklib.dbconn import get_suite
+from daklib.dbconn import get_suite, get_suite_architectures
 
 ################################################################################
 
@@ -314,13 +313,13 @@ def main():
         suites = Cnf.SubTree("Suite").List()
 
     for suitename in suites:
-        print "Processing: " + suite
+        print "Processing: " + suitename
         SuiteBlock = Cnf.SubTree("Suite::" + suitename)
 
         suiteobj = get_suite(suitename.lower())
 
         # Use the canonical version of the suite name
-        suite = suite.suite_name
+        suite = suiteobj.suite_name
 
         if suiteobj.untouchable:
             print "Skipping: " + suite + " (untouchable)"