X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_index_diffs.py;h=21c631b9a39ba25eef58d3f879bf7bdcc9a406c0;hb=32dc9d52c53207a6524ecf63ac7866435ae40374;hp=097707d8a5848a5b1a67df95d1b8d81773c83446;hpb=ec73fa2dc5acdc3062336d90685a17dfc4b21213;p=dak.git

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 097707d8..21c631b9 100755
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -37,12 +37,12 @@ import tempfile
 import subprocess
 import time
 import apt_pkg
+
 from daklib import utils
-from daklib import database
+from daklib.dbconn import get_suite, get_suite_architectures
 
 ################################################################################
 
-projectB = None
 Cnf = None
 Logger = None
 Options = None
@@ -313,19 +313,20 @@ def main():
     if not suites:
         suites = Cnf.SubTree("Suite").List()
 
-    for suite in suites:
-        print "Processing: " + suite
-        SuiteBlock = Cnf.SubTree("Suite::" + suite)
+    for suitename in suites:
+        print "Processing: " + suitename
+        SuiteBlock = Cnf.SubTree("Suite::" + suitename)
+
+        suiteobj = get_suite(suitename.lower())
 
-        if SuiteBlock.has_key("Untouchable"):
+        # Use the canonical version of the suite name
+        suite = suiteobj.suite_name
+
+        if suiteobj.untouchable:
             print "Skipping: " + suite + " (untouchable)"
             continue
 
-        suite = suite.lower()
-
-        architectures = database.get_suite_architectures(suite)
-        if architectures == None:
-            architectures = []
+        architectures = get_suite_architectures(suite, skipall=True)
 
         if SuiteBlock.has_key("Components"):
             components = SuiteBlock.ValueList("Components")
@@ -349,9 +350,8 @@ def main():
             print "ALERT: suite %s not in %s, nor untouchable!" % (suite, aptcnf_filename)
             continue
 
-        for architecture in architectures:
-            if architecture == "all":
-                continue
+        for archobj in architectures:
+            architecture = archobj.arch_string
 
             if architecture != "source":
                 # Process Contents