X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=0e1b34ff23ee9b86802af1668c7d574b868e34a1;hb=4830d9be143c7645ea932b53fae095e275ad7814;hp=15a471cd231a2ef7168c723b81195d08b942a9e1;hpb=9b06f7936bbcc196752d3e217a2a5eef5cbe4ea8;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 15a471cd..0e1b34ff 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -3,6 +3,10 @@ """ 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 @copyright: 2000, 2001, 2002, 2003, 2006 James Troup @copyright: 2009 Joerg Jaspert @@ -38,6 +42,12 @@ Script to automate some parts of checking NEW packages ################################################################################ +# suppress some deprecation warnings in squeeze related to md5 module +import warnings +warnings.filterwarnings('ignore', \ + "the md5 module is deprecated; use hashlib instead", \ + DeprecationWarning) + import errno import os import re @@ -47,6 +57,7 @@ import apt_pkg import apt_inst import shutil import commands +import threading from daklib import utils from daklib.dbconn import DBConn, get_binary_from_name_suite @@ -59,7 +70,8 @@ from daklib.regexes import html_escaping, re_html_escaping, re_version, re_space Cnf = None Cnf = utils.get_conf() -printed_copyrights = {} +printed = threading.local() +printed.copyrights = {} package_relations = {} #: Store relations of packages for later output # default is to not output html. @@ -91,13 +103,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 @@ -108,7 +120,8 @@ ansi_colours = { 'arch': "\033[32m", 'end': "\033[0m", 'bold': "\033[1m", - 'maintainer': "\033[32m"} + 'maintainer': "\033[32m", + 'distro': "\033[1m\033[41m"} html_colours = { 'main': ('',""), @@ -116,7 +129,8 @@ html_colours = { 'nonfree': ('',""), 'arch': ('',""), 'bold': ('',""), - 'maintainer': ('',"")} + 'maintainer': ('',""), + 'distro': ('',"")} def colour_output(s, colour): if use_html: @@ -154,18 +168,20 @@ def format_field(k,v): def foldable_output(title, elementnameprefix, content, norow=False): d = {'elementnameprefix':elementnameprefix} + result = '' if use_html: - print """""" + result += """""" + return result ################################################################################ @@ -267,12 +283,12 @@ def read_control (filename): return (control, control_keys, section, depends, recommends, arch, maintainer) -def read_changes_or_dsc (suite, filename): +def read_changes_or_dsc (suite, filename, session = None): dsc = {} 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() @@ -286,10 +302,13 @@ def read_changes_or_dsc (suite, filename): for k in dsc.keys(): if k in ("build-depends","build-depends-indep"): - dsc[k] = create_depends_string(suite, split_depends(dsc[k])) + dsc[k] = create_depends_string(suite, split_depends(dsc[k]), session) elif k == "architecture": if (dsc["architecture"] != "any"): dsc['architecture'] = colour_output(dsc["architecture"], 'arch') + elif k == "distribution": + if dsc["distribution"] not in ('unstable', 'experimental'): + dsc['distribution'] = colour_output(dsc["distribution"], 'distro') elif k in ("files","changes","description"): if use_html: dsc[k] = formatted_text(dsc[k], strip=True) @@ -303,15 +322,14 @@ def read_changes_or_dsc (suite, filename): filecontents = '\n'.join(map(lambda x: format_field(x,dsc[x.lower()]), keysinorder))+'\n' return filecontents -def create_depends_string (suite, depends_tree): +def create_depends_string (suite, depends_tree, session = None): 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 += ", " @@ -321,7 +339,7 @@ def create_depends_string (suite, depends_tree): result += " | " # doesn't do version lookup yet. - res = get_binary_from_name_suite(d['name'], suite_where) + res = get_binary_from_name_suite(d['name'], suite_where, session) if res.rowcount > 0: i = res.fetchone() @@ -360,9 +378,9 @@ def output_package_relations (): to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation]) package_relations.clear() - foldable_output("Package relations", "relations", to_print) + return foldable_output("Package relations", "relations", to_print) -def output_deb_info(suite, filename, packagename): +def output_deb_info(suite, filename, packagename, session = None): (control, control_keys, section, depends, recommends, arch, maintainer) = read_control(filename) if control == '': @@ -372,10 +390,10 @@ def output_deb_info(suite, filename, packagename): package_relations[packagename] = {} for key in control_keys : if key == 'Depends': - field_value = create_depends_string(suite, depends) + field_value = create_depends_string(suite, depends, session) package_relations[packagename][key] = field_value elif key == 'Recommends': - field_value = create_depends_string(suite, recommends) + field_value = create_depends_string(suite, recommends, session) package_relations[packagename][key] = field_value elif key == 'Section': field_value = section @@ -409,6 +427,8 @@ def do_lintian (filename): return do_command("lintian --show-overrides --color always", filename, 1) def get_copyright (deb_filename): + global printed + 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)) cright = o.read()[:-1] @@ -425,11 +445,11 @@ def get_copyright (deb_filename): copyrightmd5 = md5.md5(cright).hexdigest() res = "" - if printed_copyrights.has_key(copyrightmd5) and printed_copyrights[copyrightmd5] != "%s (%s)" % (package, deb_filename): + if printed.copyrights.has_key(copyrightmd5) and printed.copyrights[copyrightmd5] != "%s (%s)" % (package, deb_filename): res += formatted_text( "NOTE: Copyright is the same as %s.\n\n" % \ - (printed_copyrights[copyrightmd5])) + (printed.copyrights[copyrightmd5])) else: - printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename) + printed.copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename) return res+formatted_text(cright) def get_readme_source (dsc_filename): @@ -460,13 +480,17 @@ def get_readme_source (dsc_filename): return res -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)) - -def check_deb (suite, deb_filename): +def check_dsc (suite, dsc_filename, session = None): + (dsc) = read_changes_or_dsc(suite, dsc_filename, session) + 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, session = None): filename = os.path.basename(deb_filename) packagename = filename.split('_')[0] @@ -475,29 +499,30 @@ def check_deb (suite, deb_filename): else: is_a_udeb = 0 - - 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, session), norow=True) + "\n" if is_a_udeb: - 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: - 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" - 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: - foldable_output("skipping copyright for udeb", "binary-%s-copyright"%packagename, - "") + result += foldable_output("skipping copyright for udeb", + "binary-%s-copyright"%packagename, "") + "\n" else: - 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" + + result += foldable_output("file listing of %s" % (filename), + "binary-%s-file-listing"%packagename, do_command("ls -l", deb_filename)) - 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. @@ -528,22 +553,24 @@ def strip_pgp_signature (filename): return contents def display_changes(suite, changes_filename): + global printed changes = read_changes_or_dsc(suite, changes_filename) - foldable_output(changes_filename, "changes", changes, norow=True) + printed.copyrights = {} + 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 (): @@ -564,6 +591,10 @@ def main (): if Options["Help"]: usage() + if Options["Html-Output"]: + global use_html + use_html = 1 + stdout_fd = sys.stdout for f in args: @@ -579,13 +610,13 @@ 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', file) + 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()