X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fcheck_proposed_updates.py;h=d45fd489c61d6815510d8e37adc6a2f08cfe8266;hb=c551da01c32f72ad427d2f9ca3c7a5658239423c;hp=afb0faaeb9a1832552e6bd75c762f5bfcf0fda43;hpb=8e60420c69a993a4041c22008dafc2fcb238d0d5;p=dak.git

diff --git a/dak/check_proposed_updates.py b/dak/check_proposed_updates.py
index afb0faae..d45fd489 100755
--- a/dak/check_proposed_updates.py
+++ b/dak/check_proposed_updates.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Dependency check proposed-updates
+""" Dependency check proposed-updates """
 # Copyright (C) 2001, 2002, 2004, 2006  James Troup <james@nocrew.org>
 
 # This program is free software; you can redistribute it and/or modify
@@ -28,15 +28,16 @@
 
 ################################################################################
 
-import pg, sys, os
+import sys, os
 import apt_pkg, apt_inst
-from daklib import database
+
+from daklib.dbconn import *
+from daklib.config import Config
 from daklib import utils
+from daklib.regexes import re_no_epoch
 
 ################################################################################
 
-Cnf = None
-projectB = None
 Options = None
 stable = {}
 stable_virtual = {}
@@ -91,7 +92,7 @@ def check_dep (depends, dep_type, check_archs, filename, files):
                             unsat = 0
                             break
                 # As part of the same .changes?
-                epochless_version = utils.re_no_epoch.sub('', version)
+                epochless_version = re_no_epoch.sub('', version)
                 dep_filename = "%s_%s_%s.deb" % (dep, epochless_version, arch)
                 if files.has_key(dep_filename):
                     if Options["debug"]:
@@ -172,9 +173,14 @@ def pass_fail (filename, result):
 ################################################################################
 
 def check_changes (filename):
+    cnf = Config()
+
     try:
         changes = utils.parse_changes(filename)
         files = utils.build_file_list(changes)
+    except ChangesUnicodeError:
+        utils.warn("Improperly encoded changes file, not utf-8")
+        return
     except:
         utils.warn("Error parsing changes file '%s'" % (filename))
         return
@@ -184,7 +190,7 @@ def check_changes (filename):
     # Move to the pool directory
     cwd = os.getcwd()
     f = files.keys()[0]
-    pool_dir = Cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[f]["component"])
+    pool_dir = cnf["Dir::Pool"] + '/' + utils.poolify(changes["source"], files[f]["component"])
     os.chdir(pool_dir)
 
     changes_result = 0
@@ -210,10 +216,12 @@ def check_deb (filename):
 ################################################################################
 
 def check_joey (filename):
+    cnf = Config()
+
     f = utils.open_file(filename)
 
     cwd = os.getcwd()
-    os.chdir("%s/dists/proposed-updates" % (Cnf["Dir::Root"]))
+    os.chdir("%s/dists/proposed-updates" % (cnf["Dir::Root"]))
 
     for line in f.readlines():
         line = line.rstrip()
@@ -237,14 +245,16 @@ def check_joey (filename):
 def parse_packages():
     global stable, stable_virtual, architectures
 
+    cnf = Config()
+
     # Parse the Packages files (since it's a sub-second operation on auric)
     suite = "stable"
     stable = {}
-    components = Cnf.ValueList("Suite::%s::Components" % (suite))
-    architectures = filter(utils.real_arch, Cnf.ValueList("Suite::%s::Architectures" % (suite)))
+    components = get_component_names()
+    architectures = [ a.arch_string for a in get_suite_architectures(suite, skipsrc=True, skipall=True) ]
     for component in components:
         for architecture in architectures:
-            filename = "%s/dists/%s/%s/binary-%s/Packages" % (Cnf["Dir::Root"], suite, component, architecture)
+            filename = "%s/dists/%s/%s/binary-%s/Packages" % (cnf["Dir::Root"], suite, component, architecture)
             packages = utils.open_file(filename, 'r')
             Packages = apt_pkg.ParseTagFile(packages)
             while Packages.Step():
@@ -265,28 +275,27 @@ def parse_packages():
 ################################################################################
 
 def main ():
-    global Cnf, projectB, Options
+    global Options
 
-    Cnf = utils.get_conf()
+    cnf = Config()
 
     Arguments = [('d', "debug", "Check-Proposed-Updates::Options::Debug"),
                  ('q',"quiet","Check-Proposed-Updates::Options::Quiet"),
                  ('v',"verbose","Check-Proposed-Updates::Options::Verbose"),
                  ('h',"help","Check-Proposed-Updates::Options::Help")]
     for i in [ "debug", "quiet", "verbose", "help" ]:
-        if not Cnf.has_key("Check-Proposed-Updates::Options::%s" % (i)):
-            Cnf["Check-Proposed-Updates::Options::%s" % (i)] = ""
+        if not cnf.has_key("Check-Proposed-Updates::Options::%s" % (i)):
+            cnf["Check-Proposed-Updates::Options::%s" % (i)] = ""
 
-    arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
-    Options = Cnf.SubTree("Check-Proposed-Updates::Options")
+    arguments = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv)
+    Options = cnf.SubTree("Check-Proposed-Updates::Options")
 
     if Options["Help"]:
         usage(0)
     if not arguments:
         utils.fubar("need at least one package name as an argument.")
 
-    projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
+    DBConn()
 
     print "Parsing packages files...",
     parse_packages()