X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=9448724e164f22ad4c31a4e40819a2919b76ea90;hb=d0b5ef925b72dc0610d34037606f15cb81e02e7c;hp=49d18dc685dfabb0668e9b70c76833c39d6dd336;hpb=6a1992c646a03352b9872f010d29e46a823defbf;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 49d18dc6..9448724e 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -1,7 +1,13 @@ #!/usr/bin/env python -# Script to automate some parts of checking NEW packages -# Copyright (C) 2000, 2001, 2002, 2003, 2006 James Troup +""" +Script to automate some parts of checking NEW packages + +@contact: Debian FTP Master +@copyright: 2000, 2001, 2002, 2003, 2006 James Troup +@copyright: 2009 Joerg Jaspert +@license: GNU General Public License version 2 or later +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -32,28 +38,18 @@ ################################################################################ -import errno, os, pg, re, sys, md5 +import errno +import os +import pg +import re +import sys +import md5 import apt_pkg, apt_inst from daklib import database from daklib import 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)') +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 ################################################################################ @@ -65,6 +61,7 @@ projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) database.init(Cnf, projectB) printed_copyrights = {} +package_relations = {} #: Store relations of packages for later output # default is to not output html. use_html = 0 @@ -88,7 +85,7 @@ PACKAGE can be a .changes, .dsc, .deb or .udeb filename.""" def escape_if_needed(s): if use_html: - return utils.re_html_escaping.sub(lambda x: utils.html_escaping.get(x.group(0)), s) + return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s) else: return s @@ -348,17 +345,38 @@ def create_depends_string (suite, depends_tree): comma_count += 1 return result -def output_deb_info(suite, filename): +def output_package_relations (): + """ + Output the package relations, if there is more than one package checked in this run. + """ + + if len(package_relations) < 2: + # Only list something if we have more than one binary to compare + return + + to_print = "" + for package in package_relations: + for relation in package_relations[package]: + to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation]) + + package_relations.clear() + 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) if control == '': return formatted_text("no control info") to_print = "" + if not package_relations.has_key(packagename): + package_relations[packagename] = {} for key in control_keys : if key == 'Depends': field_value = create_depends_string(suite, depends) + package_relations[packagename][key] = field_value elif key == 'Recommends': field_value = create_depends_string(suite, recommends) + package_relations[packagename][key] = field_value elif key == 'Section': field_value = section elif key == 'Architecture': @@ -430,7 +448,7 @@ def check_deb (suite, deb_filename): foldable_output("control file for %s" % (filename), "binary-%s-control"%packagename, - output_deb_info(suite, deb_filename), norow=True) + output_deb_info(suite, deb_filename, packagename), norow=True) if is_a_udeb: foldable_output("skipping lintian check for udeb", "binary-%s-lintian"%packagename, @@ -455,11 +473,11 @@ def check_deb (suite, 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: @@ -477,7 +495,7 @@ def strip_pgp_signature (filename): inside_signature = 0 continue contents += line - file.close() + inputfile.close() return contents def display_changes(suite, changes_filename): @@ -485,7 +503,10 @@ def display_changes(suite, changes_filename): foldable_output(changes_filename, "changes", changes, norow=True) def check_changes (changes_filename): - changes = utils.parse_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) files = utils.build_file_list(changes) @@ -535,6 +556,7 @@ def main (): else: utils.fubar("Unrecognised file type: '%s'." % (f)) finally: + output_package_relations() if not Options["Html-Output"]: # Reset stdout here so future less invocations aren't FUBAR less_fd.close()