X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=5eb0b21718629a35f68169a87aa754a9f950eb7c;hb=bed91400f8f58d0d44577984ac4360068b95a5b2;hp=748a3be4afe5815aa7bad922cbbd28c548d298ff;hpb=05e76c8434279daed67dc1020fe7dc5799800616;p=dak.git
diff --git a/dak/examine_package.py b/dak/examine_package.py
index 748a3be4..5eb0b217 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -40,7 +40,6 @@ Script to automate some parts of checking NEW packages
import errno
import os
-import pg
import re
import sys
import md5
@@ -48,8 +47,9 @@ import apt_pkg
import apt_inst
import shutil
import commands
-from daklib import database
+
from daklib import utils
+from daklib.dbconn import DBConn, get_binary_from_name_suite
from daklib.regexes import html_escaping, re_html_escaping, re_version, re_spacestrip, \
re_contrib, re_nonfree, re_localhost, re_newlinespace, \
re_package, re_doc_directory
@@ -57,11 +57,7 @@ from daklib.regexes import html_escaping, re_html_escaping, re_version, re_space
################################################################################
Cnf = None
-projectB = None
-
Cnf = utils.get_conf()
-projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-database.init(Cnf, projectB)
printed_copyrights = {}
package_relations = {} #: Store relations of packages for later output
@@ -95,13 +91,13 @@ def escape_if_needed(s):
def headline(s, level=2, bodyelement=None):
if use_html:
if bodyelement:
- print """
+ return """
| %(title)s (click to toggle) |
|---|
- """%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
+ \n"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
else:
- print "%s" % (level, utils.html_escape(s), level)
+ return "%s\n" % (level, utils.html_escape(s), level)
else:
- print "---- %s ----" % (s)
+ return "---- %s ----\n" % (s)
# Colour definitions, 'end' isn't really for use
@@ -158,18 +154,20 @@ def format_field(k,v):
def foldable_output(title, elementnameprefix, content, norow=False):
d = {'elementnameprefix':elementnameprefix}
+ result = ''
if use_html:
- print """
-
"""%d
- headline(title, bodyelement="%(elementnameprefix)s-body"%d)
+ result += """
+
\n"""%d
+ result += headline(title, bodyelement="%(elementnameprefix)s-body"%d)
if use_html:
- print """ """%d
+ result += """ \n"""%d
if norow:
- print content
+ result += content + "\n"
else:
- print output_row(content)
+ result += output_row(content) + "\n"
if use_html:
- print """