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)}
+ </thead>\n"""%{"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>\n" % (level, utils.html_escape(s), level)
else:
- print "---- %s ----" % (s)
+ return "---- %s ----\n" % (s)
# Colour definitions, 'end' isn't really for use
def foldable_output(title, elementnameprefix, content, norow=False):
d = {'elementnameprefix':elementnameprefix}
+ result = ''
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)
+ result += """<div id="%(elementnameprefix)s-wrap"><a name="%(elementnameprefix)s" />
+ <table class="infobox rfc822">\n"""%d
+ result += headline(title, bodyelement="%(elementnameprefix)s-body"%d)
if use_html:
- print """ <tbody id="%(elementnameprefix)s-body" class="infobody">"""%d
+ result += """ <tbody id="%(elementnameprefix)s-body" class="infobody">\n"""%d
if norow:
- print content
+ result += content + "\n"
else:
- print output_row(content)
+ result += output_row(content) + "\n"
if use_html:
- print """</tbody></table></div>"""
+ result += """</tbody></table></div>"""
+ return result
################################################################################
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()
to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation])
package_relations.clear()
- foldable_output("Package relations", "relations", to_print)
+ print foldable_output("Package relations", "relations", to_print)
def output_deb_info(suite, filename, packagename):
(control, control_keys, section, depends, recommends, arch, maintainer) = read_control(filename)
def check_dsc (suite, dsc_filename):
(dsc) = read_changes_or_dsc(suite, dsc_filename)
- foldable_output(dsc_filename, "dsc", dsc, norow=True)
- foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename))
- foldable_output("README.source for %s" % dsc_filename, "source-readmesource", get_readme_source(dsc_filename))
+ print foldable_output(dsc_filename, "dsc", dsc, norow=True)
+ print foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename))
+ print foldable_output("README.source for %s" % dsc_filename, "source-readmesource", get_readme_source(dsc_filename))
def check_deb (suite, deb_filename):
filename = os.path.basename(deb_filename)
is_a_udeb = 0
- foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename,
+ print foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename,
output_deb_info(suite, deb_filename, packagename), norow=True)
if is_a_udeb:
- foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename,
+ print foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename,
"")
else:
- foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename,
+ print foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename,
do_lintian(deb_filename))
- foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename,
+ print foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename,
do_command("dpkg -c", deb_filename))
if is_a_udeb:
- foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename,
+ print foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename,
"")
else:
- foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename,
+ print foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename,
get_copyright(deb_filename))
- foldable_output("file listing of %s" % (filename), "binary-%s-file-listing"%packagename,
+ print foldable_output("file listing of %s" % (filename), "binary-%s-file-listing"%packagename,
do_command("ls -l", deb_filename))
# Read a file, strip the signature and return the modified contents as
def display_changes(suite, changes_filename):
changes = read_changes_or_dsc(suite, changes_filename)
- foldable_output(changes_filename, "changes", changes, norow=True)
+ print foldable_output(changes_filename, "changes", changes, norow=True)
def check_changes (changes_filename):
try:
if Options["Help"]:
usage()
+ if Options["Html-Output"]:
+ global use_html
+ use_html = 1
+
stdout_fd = sys.stdout
for f in args:
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: