get_suite_architectures

[dak.git] / dak / compare_suites.py

diff --git a/dak/compare_suites.py b/dak/compare_suites.py
index c5be26638594d24a2a0320b14eb8d211e7e121c2..01652d94fc953a93a2c58e5b53624f3c5a0c5a50 100755 (executable)
--- a/dak/compare_suites.py
+++ b/dak/compare_suites.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Check for fixable discrepancies between stable and unstable
+""" Check for fixable discrepancies between stable and unstable """
 # Copyright (C) 2000, 2001, 2002, 2003, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -22,8 +22,8 @@
 
 import pg, sys
 import apt_pkg
-import dak.lib.database as database
-import dak.lib.utils as utils
+from daklib import database
+from daklib import utils
 
 ################################################################################
 
@@ -47,14 +47,14 @@ def main ():
     Cnf = utils.get_conf()
     Arguments = [('h',"help","Compare-Suites::Options::Help")]
     for i in [ "help" ]:
-       if not Cnf.has_key("Compare-Suites::Options::%s" % (i)):
-           Cnf["Compare-Suites::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Compare-Suites::Options::%s" % (i)):
+            Cnf["Compare-Suites::Options::%s" % (i)] = ""
 
     apt_pkg.ParseCommandLine(Cnf, Arguments, sys.argv)
 
     Options = Cnf.SubTree("Compare-Suites::Options")
     if Options["Help"]:
-       usage()
+        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
     database.init(Cnf, projectB)
@@ -67,7 +67,7 @@ def main ():
     arch_all_id = database.get_architecture_id("all")
     dsc_type_id = database.get_override_type_id("dsc")
 
-    for arch in Cnf.ValueList("Suite::%s::Architectures" % (src_suite)):
+    for arch in database.get_suite_architectures(src_suite_id):
         if arch == "source":
             continue
 
@@ -99,4 +99,3 @@ ORDER BY b_src.package;"""
 
 if __name__ == '__main__':
     main()
-