X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=eb602794304cf5e562f3d168386d4373e1d5a18d;hb=603d8ace7d4f942c999c29556bde38ec2516b9a8;hp=81191d257616963e492512d62aa94f2e44520f3c;hpb=3a48d9bed2ff0984eee329153f4e158919a597ec;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 81191d25..eb602794 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Script to automate some parts of checking NEW packages +""" Script to automate some parts of checking NEW packages """ # Copyright (C) 2000, 2001, 2002, 2003, 2006 James Troup # This program is free software; you can redistribute it and/or modify @@ -34,29 +34,11 @@ import errno, os, pg, re, sys, md5 import apt_pkg, apt_inst -import daklib.database as database -import daklib.utils as utils - -################################################################################ - -re_package = re.compile(r"^(.+?)_.*") -re_doc_directory = re.compile(r".*/doc/([^/]*).*") - -re_contrib = re.compile('^contrib/') -re_nonfree = re.compile('^non\-free/') - -re_arch = re.compile("Architecture: .*") -re_builddep = re.compile("Build-Depends: .*") -re_builddepind = re.compile("Build-Depends-Indep: .*") - -re_localhost = re.compile("localhost\.localdomain") -re_version = re.compile('^(.*)\((.*)\)') - -re_newlinespace = re.compile('\n') -re_spacestrip = re.compile('(\s)') - -html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'} -re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys()))) +from daklib import database +from daklib import utils +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 ################################################################################ @@ -89,9 +71,6 @@ PACKAGE can be a .changes, .dsc, .deb or .udeb filename.""" ################################################################################ # probably xml.sax.saxutils would work as well -def html_escape(s): - return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s) - def escape_if_needed(s): if use_html: return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s) @@ -103,9 +82,9 @@ def headline(s, level=2, bodyelement=None): if bodyelement: print """ %(title)s (click to toggle) - """%{"bodyelement":bodyelement,"title":html_escape(s)} + """%{"bodyelement":bodyelement,"title":utils.html_escape(s)} else: - print "%s" % (level, html_escape(s), level) + print "%s" % (level, utils.html_escape(s), level) else: print "---- %s ----" % (s) @@ -130,7 +109,7 @@ html_colours = { def colour_output(s, colour): if use_html: - return ("%s%s%s" % (html_colours[colour][0], html_escape(s), html_colours[colour][1])) + return ("%s%s%s" % (html_colours[colour][0], utils.html_escape(s), html_colours[colour][1])) else: return ("%s%s%s" % (ansi_colours[colour], s, ansi_colours['end'])) @@ -146,7 +125,7 @@ def formatted_text(s, strip=False): if use_html: if strip: s = s.strip() - return "
%s
" % (html_escape(s)) + return "
%s
" % (utils.html_escape(s)) else: return s @@ -277,7 +256,7 @@ def read_control (filename): return (control, control_keys, section, depends, recommends, arch, maintainer) -def read_changes_or_dsc (filename): +def read_changes_or_dsc (suite, filename): dsc = {} dsc_file = utils.open_file(filename) @@ -296,7 +275,7 @@ def read_changes_or_dsc (filename): for k in dsc.keys(): if k in ("build-depends","build-depends-indep"): - dsc[k] = create_depends_string(split_depends(dsc[k])) + dsc[k] = create_depends_string(suite, split_depends(dsc[k])) elif k == "architecture": if (dsc["architecture"] != "any"): dsc['architecture'] = colour_output(dsc["architecture"], 'arch') @@ -313,10 +292,13 @@ def read_changes_or_dsc (filename): filecontents = '\n'.join(map(lambda x: format_field(x,dsc[x.lower()]), keysinorder))+'\n' return filecontents -def create_depends_string (depends_tree): - # just look up unstable for now. possibly pull from .changes later - suite = "unstable" +def create_depends_string (suite, depends_tree): result = "" + if suite == 'experimental': + suite_where = " in ('experimental','unstable')" + else: + suite_where = " ='%s'" % suite + comma_count = 1 for l in depends_tree: if (comma_count >= 2): @@ -327,7 +309,7 @@ def create_depends_string (depends_tree): 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)) + 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] @@ -351,7 +333,7 @@ def create_depends_string (depends_tree): comma_count += 1 return result -def output_deb_info(filename): +def output_deb_info(suite, filename): (control, control_keys, section, depends, recommends, arch, maintainer) = read_control(filename) if control == '': @@ -359,9 +341,9 @@ def output_deb_info(filename): to_print = "" for key in control_keys : if key == 'Depends': - field_value = create_depends_string(depends) + field_value = create_depends_string(suite, depends) elif key == 'Recommends': - field_value = create_depends_string(recommends) + field_value = create_depends_string(suite, recommends) elif key == 'Section': field_value = section elif key == 'Architecture': @@ -417,12 +399,12 @@ def get_copyright (deb_filename): printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename) return res+formatted_text(cright) -def check_dsc (dsc_filename): - (dsc) = read_changes_or_dsc(dsc_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)) -def check_deb (deb_filename): +def check_deb (suite, deb_filename): filename = os.path.basename(deb_filename) packagename = filename.split('_')[0] @@ -433,7 +415,7 @@ def check_deb (deb_filename): foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename, - output_deb_info(deb_filename), norow=True) + output_deb_info(suite, deb_filename), norow=True) if is_a_udeb: foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename, @@ -458,11 +440,11 @@ def check_deb (deb_filename): # Read a file, strip the signature and return the modified contents as # a string. def strip_pgp_signature (filename): - file = utils.open_file (filename) + inputfile = utils.open_file (filename) contents = "" inside_signature = 0 skip_next = 0 - for line in file.readlines(): + for line in inputfile.readlines(): if line[:-1] == "": continue if inside_signature: @@ -480,23 +462,26 @@ def strip_pgp_signature (filename): inside_signature = 0 continue contents += line - file.close() + inputfile.close() return contents -def display_changes(changes_filename): - changes = read_changes_or_dsc(changes_filename) +def display_changes(suite, changes_filename): + changes = read_changes_or_dsc(suite, changes_filename) foldable_output(changes_filename, "changes", changes, norow=True) def check_changes (changes_filename): - display_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) - changes = utils.parse_changes (changes_filename) files = utils.build_file_list(changes) for f in files.keys(): if f.endswith(".deb") or f.endswith(".udeb"): - check_deb(f) + check_deb(changes['distribution'], f) if f.endswith(".dsc"): - check_dsc(f) + check_dsc(changes['distribution'], f) # else: => byhand def main (): @@ -530,9 +515,11 @@ def main (): if f.endswith(".changes"): check_changes(f) elif f.endswith(".deb") or f.endswith(".udeb"): - check_deb(file) + # default to unstable when we don't have a .changes file + # perhaps this should be a command line option? + check_deb('unstable', file) elif f.endswith(".dsc"): - check_dsc(f) + check_dsc('unstable', f) else: utils.fubar("Unrecognised file type: '%s'." % (f)) finally: