import errno
import os
-import pg
import re
import sys
import md5
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
################################################################################
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
def headline(s, level=2, bodyelement=None):
if use_html:
if bodyelement:
- print """<thead>
+ return """<thead>
<tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s <span class="toggle-msg">(click to toggle)</span></th></tr>
</thead>"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
else:
- print "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
+ return "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
else:
- print "---- %s ----" % (s)
+ return "---- %s ----" % (s)
# Colour definitions, 'end' isn't really for use
if use_html:
print """<div id="%(elementnameprefix)s-wrap"><a name="%(elementnameprefix)s" />
<table class="infobox rfc822">"""%d
- headline(title, bodyelement="%(elementnameprefix)s-body"%d)
+ print headline(title, bodyelement="%(elementnameprefix)s-body"%d)
if use_html:
print """ <tbody id="%(elementnameprefix)s-body" class="infobody">"""%d
if norow:
dsc_file = utils.open_file(filename)
try:
- dsc = utils.parse_changes(filename)
+ dsc = utils.parse_changes(filename, dsc_file=1)
except:
return formatted_text("can't parse .dsc control info")
dsc_file.close()
def create_depends_string (suite, depends_tree):
result = ""
if suite == 'experimental':
- suite_where = " in ('experimental','unstable')"
+ suite_where = "in ('experimental','unstable')"
else:
- suite_where = " ='%s'" % suite
+ suite_where = "= '%s'" % suite
comma_count = 1
+ session = DBConn().session()
for l in depends_tree:
if (comma_count >= 2):
result += ", "
result += " | "
# doesn't do version lookup yet.
- q = projectB.query("SELECT DISTINCT(b.package), b.version, c.name, su.suite_name FROM binaries b, files fi, location l, component c, bin_associations ba, suite su WHERE b.package='%s' AND b.file = fi.id AND fi.location = l.id AND l.component = c.id AND ba.bin=b.id AND ba.suite = su.id AND su.suite_name %s ORDER BY b.version desc" % (d['name'], suite_where))
- ql = q.getresult()
- if ql:
- i = ql[0]
+ res = get_binary_from_name_suite(d['name'], suite_where)
+ if res.rowcount > 0:
+ i = res.fetchone()
adepends = d['name']
if d['version'] != '' :
if len(package_relations) < 2:
# Only list something if we have more than one binary to compare
+ package_relations.clear()
return
to_print = ""
if os.path.exists(path):
res += do_command("cat", path)
else:
- res += "No README.source in this package"
+ res += "No README.source in this package\n\n"
try:
shutil.rmtree(tempdir)
# else: => byhand
def main ():
- global Cnf, projectB, db_files, waste, excluded
+ global Cnf, db_files, waste, excluded
# Cnf = utils.get_conf()
elif f.endswith(".deb") or f.endswith(".udeb"):
# default to unstable when we don't have a .changes file
# perhaps this should be a command line option?
- check_deb('unstable', file)
+ check_deb('unstable', f)
elif f.endswith(".dsc"):
check_dsc('unstable', f)
else: