################################################################################
-import errno, os, pg, re, sys, md5, time
+import errno, os, pg, re, sys, md5
import apt_pkg, apt_inst
-import daklib.database, daklib.utils
+import daklib.database, daklib.utils, daklib.queue
################################################################################
else:
return s
-def headline(s, level=2):
+def headline(s, level=2, bodyelement=None):
if use_html:
- print "<h%d>%s</h%d>" % (level,html_escape(s),level)
+ if bodyelement:
+ print """<thead>
+ <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s</th></tr>
+ </thead>"""%{"bodyelement":bodyelement,"title":html_escape(s)}
+ else:
+ print "<h%d>%s</h%d>" % (level, html_escape(s), level)
else:
print "---- %s ----" % (s)
else:
return ("%s%s%s" % (ansi_colours[colour], s, ansi_colours['end']))
-def print_escaped_text(s):
+def escaped_text(s):
if use_html:
- print "<pre>%s</pre>" % (s)
+ return "<pre>%s</pre>" % (s)
else:
- print s
+ return s
-def print_formatted_text(s):
+def formatted_text(s):
if use_html:
- print "<pre>%s</pre>" % (html_escape(s))
+ return "<pre>%s</pre>" % (html_escape(s))
else:
- print s
+ return s
+
+def output_row(s):
+ if use_html:
+ return """<tr><td>"""+s+"""</td></tr>"""
+ else:
+ return s
+
+def foldable_output(title, elementnameprefix, content):
+ d = {'elementnameprefix':elementnameprefix}
+ 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)
+ if use_html:
+ print """ <tbody id="%(elementnameprefix)s-body" class="infobody">"""%d
+ print output_row(content)
+ if use_html:
+ print """</tbody></table></div>"""
################################################################################
extracts = apt_inst.debExtractControl(deb_file)
control = apt_pkg.ParseSection(extracts)
except:
- print_formatted_text("can't parse control info")
+ print formatted_text("can't parse control info")
# TV-COMMENT: this will raise exceptions in two lines
control = ''
try:
dsc = daklib.utils.parse_changes(dsc_filename)
except:
- print_formatted_text("can't parse control info")
+ return formatted_text("can't parse control info")
dsc_file.close()
filecontents = escape_if_needed(strip_pgp_signature(dsc_filename))
def output_deb_info(filename):
(control, control_keys, section, depends, recommends, arch, maintainer) = read_control(filename)
- to_print = ""
if control == '':
- print_formatted_text("no control info")
- else:
- for key in control_keys :
- output = " " + key + ": "
- if key == 'Depends':
- output += create_depends_string(depends)
- elif key == 'Recommends':
- output += create_depends_string(recommends)
- elif key == 'Section':
- output += section
- elif key == 'Architecture':
- output += arch
- elif key == 'Maintainer':
- output += maintainer
- elif key == 'Description':
- desc = control.Find(key)
- desc = re_newlinespace.sub('\n ', desc)
- output += escape_if_needed(desc)
- else:
- output += escape_if_needed(control.Find(key))
- to_print += output + '\n'
- print_escaped_text(to_print)
-
-def do_command (command, filename):
+ return formatted_text("no control info")
+ to_print = ""
+ for key in control_keys :
+ output = " " + key + ": "
+ if key == 'Depends':
+ output += create_depends_string(depends)
+ elif key == 'Recommends':
+ output += create_depends_string(recommends)
+ elif key == 'Section':
+ output += section
+ elif key == 'Architecture':
+ output += arch
+ elif key == 'Maintainer':
+ output += maintainer
+ elif key == 'Description':
+ desc = control.Find(key)
+ desc = re_newlinespace.sub('\n ', desc)
+ output += escape_if_needed(desc)
+ else:
+ output += escape_if_needed(control.Find(key))
+ to_print += output + '\n'
+ return escaped_text(to_print)
+
+def do_command (command, filename, escaped=0):
o = os.popen("%s %s" % (command, filename))
- print_formatted_text(o.read())
+ if escaped:
+ return escaped_text(o.read())
+ else:
+ return formatted_text(o.read())
def do_lintian (filename):
- # lintian currently does not have html coloring, so dont use color for lintian (yet)
if use_html:
- do_command("lintian --show-overrides", filename)
+ return do_command("lintian --show-overrides --color html", filename, 1)
else:
- do_command("lintian --show-overrides --color always", filename)
+ return do_command("lintian --show-overrides --color always", filename, 1)
-def print_copyright (deb_filename):
+def get_copyright (deb_filename):
package = re_package.sub(r'\1', deb_filename)
o = os.popen("dpkg-deb -c %s | egrep 'usr(/share)?/doc/[^/]*/copyright' | awk '{print $6}' | head -n 1" % (deb_filename))
copyright = o.read()[:-1]
if copyright == "":
- print_formatted_text("WARNING: No copyright found, please check package manually.")
- return
+ return formatted_text("WARNING: No copyright found, please check package manually.")
doc_directory = re_doc_directory.sub(r'\1', copyright)
if package != doc_directory:
- print_formatted_text("WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory))
- return
+ return formatted_text("WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory))
o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s 2>/dev/null" % (deb_filename, copyright))
copyright = o.read()
copyrightmd5 = md5.md5(copyright).hexdigest()
+ res = ""
if printed_copyrights.has_key(copyrightmd5) and printed_copyrights[copyrightmd5] != "%s (%s)" % (package, deb_filename):
- print_formatted_text( "NOTE: Copyright is the same as %s.\n" % \
- (printed_copyrights[copyrightmd5]))
+ res += formatted_text( "NOTE: Copyright is the same as %s.\n" % \
+ (printed_copyrights[copyrightmd5]))
else:
printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename)
-
- print_formatted_text(copyright)
+ return res+formatted_text(copyright)
def check_dsc (dsc_filename):
- headline(".dsc file for %s" % (dsc_filename))
(dsc) = read_dsc(dsc_filename)
- print_escaped_text(dsc)
- headline("lintian check for %s" % (dsc_filename))
- do_lintian(dsc_filename)
+ foldable_output(dsc_filename, "dsc", escaped_text(dsc))
+ foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename))
def check_deb (deb_filename):
filename = os.path.basename(deb_filename)
+ packagename = filename.split('_')[0]
if filename.endswith(".udeb"):
is_a_udeb = 1
else:
is_a_udeb = 0
- headline("control file for %s" % (filename))
- #do_command ("dpkg -I", deb_filename)
- output_deb_info(deb_filename)
+
+ foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename,
+ output_deb_info(deb_filename))
if is_a_udeb:
- headline("skipping lintian check for µdeb")
- print
+ foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename,
+ "")
else:
- headline("lintian check for %s" % (filename))
- do_lintian(deb_filename)
- headline("---- linda check for %s ----" % (filename))
- do_command ("linda", deb_filename)
+ foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename,
+ do_lintian(deb_filename))
- headline("contents of %s" % (filename))
- do_command ("dpkg -c", deb_filename)
+ foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename,
+ do_command("dpkg -c", deb_filename))
if is_a_udeb:
- headline("skipping copyright for µdeb")
+ foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename,
+ "")
else:
- headline("copyright of %s" % (filename))
- print_copyright(deb_filename)
+ foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename,
+ get_copyright(deb_filename))
- headline("file listing of %s" % (filename))
- do_command ("ls -l", deb_filename)
+ 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
# a string.
return contents
# Display the .changes [without the signature]
-def display_changes (changes_filename):
- headline(".changes file for %s" % (changes_filename))
- print_formatted_text(strip_pgp_signature(changes_filename))
+# TV-COMMENT: M. Ferrari has more formatting ideas
+def display_changes(changes_filename):
+ foldable_output(changes_filename, "changes", formatted_text(strip_pgp_signature(changes_filename)))
def check_changes (changes_filename):
display_changes(changes_filename)
# Cnf = daklib.utils.get_conf()
Arguments = [('h',"help","Examine-Package::Options::Help"),
- ('H',"Html-output","Examine-Package::Options::Html-Output"),
+ ('H',"html-output","Examine-Package::Options::Html-Output"),
]
for i in [ "Help", "Html-Output", "partial-html" ]:
if not Cnf.has_key("Examine-Package::Options::%s" % (i)):