"""
Script to automate some parts of checking NEW packages
+Most functions are written in a functional programming style. They
+return a string avoiding the side effect of directly printing the string
+to stdout. Those functions can be used in multithreaded parts of dak.
+
@contact: Debian FTP Master <ftpmaster@debian.org>
@copyright: 2000, 2001, 2002, 2003, 2006 James Troup <james@nocrew.org>
@copyright: 2009 Joerg Jaspert <joerg@debian.org>
to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation])
package_relations.clear()
- print foldable_output("Package relations", "relations", to_print)
+ return 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)
- 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))
+ return foldable_output(dsc_filename, "dsc", dsc, norow=True) + \
+ "\n" + \
+ foldable_output("lintian check for %s" % dsc_filename,
+ "source-lintian", do_lintian(dsc_filename)) + \
+ "\n" + \
+ 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)
else:
is_a_udeb = 0
-
- print foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename,
- output_deb_info(suite, deb_filename, packagename), norow=True)
+ result = foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename,
+ output_deb_info(suite, deb_filename, packagename), norow=True) + "\n"
if is_a_udeb:
- print foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename,
- "")
+ result += foldable_output("skipping lintian check for udeb",
+ "binary-%s-lintian"%packagename, "") + "\n"
else:
- print foldable_output("lintian check for %s" % (filename), "binary-%s-lintian"%packagename,
- do_lintian(deb_filename))
+ result += foldable_output("lintian check for %s" % (filename),
+ "binary-%s-lintian"%packagename, do_lintian(deb_filename)) + "\n"
- print foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename,
- do_command("dpkg -c", deb_filename))
+ result += foldable_output("contents of %s" % (filename), "binary-%s-contents"%packagename,
+ do_command("dpkg -c", deb_filename)) + "\n"
if is_a_udeb:
- print foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename,
- "")
+ result += foldable_output("skipping copyright for udeb",
+ "binary-%s-copyright"%packagename, "") + "\n"
else:
- print foldable_output("copyright of %s" % (filename), "binary-%s-copyright"%packagename,
- get_copyright(deb_filename))
+ result += foldable_output("copyright of %s" % (filename),
+ "binary-%s-copyright"%packagename, get_copyright(deb_filename)) + "\n"
- print foldable_output("file listing of %s" % (filename), "binary-%s-file-listing"%packagename,
- do_command("ls -l", deb_filename))
+ result += foldable_output("file listing of %s" % (filename),
+ "binary-%s-file-listing"%packagename, do_command("ls -l", deb_filename))
+
+ return result
# Read a file, strip the signature and return the modified contents as
# a string.
def display_changes(suite, changes_filename):
changes = read_changes_or_dsc(suite, changes_filename)
- print foldable_output(changes_filename, "changes", changes, norow=True)
+ return foldable_output(changes_filename, "changes", changes, norow=True)
def check_changes (changes_filename):
try:
changes = utils.parse_changes (changes_filename)
except ChangesUnicodeError:
utils.warn("Encoding problem with changes file %s" % (changes_filename))
- display_changes(changes['distribution'], changes_filename)
+ print display_changes(changes['distribution'], changes_filename)
files = utils.build_file_list(changes)
for f in files.keys():
if f.endswith(".deb") or f.endswith(".udeb"):
- check_deb(changes['distribution'], f)
+ print check_deb(changes['distribution'], f)
if f.endswith(".dsc"):
- check_dsc(changes['distribution'], f)
+ print check_dsc(changes['distribution'], f)
# else: => byhand
def main ():
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', f)
+ print check_deb('unstable', f)
elif f.endswith(".dsc"):
- check_dsc('unstable', f)
+ print check_dsc('unstable', f)
else:
utils.fubar("Unrecognised file type: '%s'." % (f))
finally:
- output_package_relations()
+ print output_package_relations()
if not Options["Html-Output"]:
# Reset stdout here so future less invocations aren't FUBAR
less_fd.close()
def html_header(name, filestoexamine):
if name.endswith('.changes'):
name = ' '.join(name.split('_')[:2])
- print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ result = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
<head>
<meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8"
Debian NEW package overview for %(name)s
</span>
</div>
+
"""%{"name":name}
# we assume only one source (.dsc) per changes here
- print """
+ result += """
<div id="menu">
<p class="title">Navigation</p>
<p><a href="#changes" onclick="show('changes-body')">.changes</a></p>
<p><a href="#dsc" onclick="show('dsc-body')">.dsc</a></p>
<p><a href="#source-lintian" onclick="show('source-lintian-body')">source lintian</a></p>
- """
+
+"""
for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
packagename = fn.split('_')[0]
- print """
+ result += """
<p class="subtitle">%(pkg)s</p>
<p><a href="#binary-%(pkg)s-control" onclick="show('binary-%(pkg)s-control-body')">control file</a></p>
<p><a href="#binary-%(pkg)s-lintian" onclick="show('binary-%(pkg)s-lintian-body')">binary lintian</a></p>
<p><a href="#binary-%(pkg)s-contents" onclick="show('binary-%(pkg)s-contents-body')">.deb contents</a></p>
<p><a href="#binary-%(pkg)s-copyright" onclick="show('binary-%(pkg)s-copyright-body')">copyright</a></p>
<p><a href="#binary-%(pkg)s-file-listing" onclick="show('binary-%(pkg)s-file-listing-body')">file listing</a></p>
- """%{"pkg":packagename}
- print " </div>"
+
+"""%{"pkg":packagename}
+ result += " </div>"
+ return result
def html_footer():
- print """ <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- print """ <p><a href="http://validator.w3.org/check?uri=referer">
+ result = """ <p class="validate">Timestamp: %s (UTC)</p>
+"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+ result += """ <p><a href="http://validator.w3.org/check?uri=referer">
<img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"
style="border: none; height: 31px; width: 88px" /></a>
<a href="http://jigsaw.w3.org/css-validator/check/referer">
</body>
</html>
"""
-#"""
+ return result
+
################################################################################
for fn in new[pkg]["files"]:
filestoexamine.append(fn)
- html_header(changes["source"], filestoexamine)
+ print html_header(changes["source"], filestoexamine)
check_valid(new)
distribution = changes["distribution"].keys()[0]
- examine_package.display_changes(distribution, changes_file)
+ print examine_package.display_changes(distribution, changes_file)
for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
- examine_package.check_dsc(distribution, fn)
+ print examine_package.check_dsc(distribution, fn)
for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
- examine_package.check_deb(distribution, fn)
+ print examine_package.check_deb(distribution, fn)
- html_footer()
+ print html_footer()
if sys.stdout != stdout_fd:
sys.stdout.close()
sys.stdout = stdout_fd
projects / dak.git / commitdiff