X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=eabd8850806d8e7a3d2cbcd49b145fe4eaf87d6a;hb=94dcb438da061093e80d33a4f3485c45314e06ea;hp=65e81b5def1dce9f039b42c633ed0b16424c0855;hpb=674cd1cfc5a8f72b06e11652c62cfffbb362860a;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 65e81b5d..eabd8850 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -61,9 +61,11 @@ import threading from daklib import utils from daklib.dbconn import DBConn, get_component_by_package_suite +from daklib.gpg import SignedFile 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 +from daklib.dak_exceptions import ChangesUnicodeError ################################################################################ @@ -105,7 +107,7 @@ def headline(s, level=2, bodyelement=None): if bodyelement: return """ %(title)s (click to toggle) - \n"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)} + \n"""%{"bodyelement":bodyelement,"title":utils.html_escape(os.path.basename(s))} else: return "%s\n" % (level, utils.html_escape(s), level) else: @@ -236,8 +238,8 @@ def read_control (filename): deb_file = utils.open_file(filename) try: - extracts = apt_inst.debExtractControl(deb_file) - control = apt_pkg.ParseSection(extracts) + extracts = utils.deb_extract_control(deb_file) + control = apt_pkg.TagSection(extracts) except: print formatted_text("can't parse control info") deb_file.close() @@ -247,17 +249,17 @@ def read_control (filename): control_keys = control.keys() - if control.has_key("Depends"): - depends_str = control.Find("Depends") + if "Depends" in control: + depends_str = control["Depends"] # create list of dependancy lists depends = split_depends(depends_str) - if control.has_key("Recommends"): - recommends_str = control.Find("Recommends") + if "Recommends" in control: + recommends_str = control["Recommends"] recommends = split_depends(recommends_str) - if control.has_key("Section"): - section_str = control.Find("Section") + if "Section" in control: + section_str = control["Section"] c_match = re_contrib.search(section_str) nf_match = re_nonfree.search(section_str) @@ -270,12 +272,12 @@ def read_control (filename): else : # main section = colour_output(section_str, 'main') - if control.has_key("Architecture"): - arch_str = control.Find("Architecture") + if "Architecture" in control: + arch_str = control["Architecture"] arch = colour_output(arch_str, 'arch') - if control.has_key("Maintainer"): - maintainer = control.Find("Maintainer") + if "Maintainer" in control: + maintainer = control["Maintainer"] localhost = re_localhost.search(maintainer) if localhost: #highlight bad email @@ -434,13 +436,13 @@ def output_deb_info(suite, filename, packagename, session = None): field_value = maintainer elif key == 'Description': if use_html: - field_value = formatted_text(control.Find(key), strip=True) + field_value = formatted_text(control.find(key), strip=True) else: - desc = control.Find(key) + desc = control.find(key) desc = re_newlinespace.sub('\n ', desc) field_value = escape_if_needed(desc) else: - field_value = escape_if_needed(control.Find(key)) + field_value = escape_if_needed(control.find(key)) to_print += " "+format_field(key,field_value)+'\n' return to_print @@ -460,7 +462,7 @@ def do_lintian (filename): def get_copyright (deb_filename): global printed - package = re_package.sub(r'\1', deb_filename) + package = re_package.sub(r'\1', os.path.basename(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] @@ -476,11 +478,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, os.path.basename(deb_filename)): res += formatted_text( "NOTE: Copyright is the same as %s.\n\n" % \ (printed.copyrights[copyrightmd5])) else: - printed.copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename) + printed.copyrights[copyrightmd5] = "%s (%s)" % (package, os.path.basename(deb_filename)) return res+formatted_text(cright) def get_readme_source (dsc_filename): @@ -505,7 +507,7 @@ def get_readme_source (dsc_filename): try: shutil.rmtree(tempdir) - except OSError, e: + except OSError as e: if errno.errorcode[e.errno] != 'EACCES': res += "%s: couldn't remove tmp dir %s for source tree." % (dsc_filename, tempdir) @@ -513,12 +515,13 @@ def get_readme_source (dsc_filename): def check_dsc (suite, dsc_filename, session = None): (dsc) = read_changes_or_dsc(suite, dsc_filename, session) + dsc_basename = os.path.basename(dsc_filename) return foldable_output(dsc_filename, "dsc", dsc, norow=True) + \ "\n" + \ - foldable_output("lintian check for %s" % dsc_filename, + foldable_output("lintian check for %s" % dsc_basename, "source-lintian", do_lintian(dsc_filename)) + \ "\n" + \ - foldable_output("README.source for %s" % dsc_filename, + foldable_output("README.source for %s" % dsc_basename, "source-readmesource", get_readme_source(dsc_filename)) def check_deb (suite, deb_filename, session = None): @@ -550,38 +553,15 @@ def check_deb (suite, deb_filename, session = None): 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)) - return result # Read a file, strip the signature and return the modified contents as # a string. def strip_pgp_signature (filename): - inputfile = utils.open_file (filename) - contents = "" - inside_signature = 0 - skip_next = 0 - for line in inputfile.readlines(): - if line[:-1] == "": - continue - if inside_signature: - continue - if skip_next: - skip_next = 0 - continue - if line.startswith("-----BEGIN PGP SIGNED MESSAGE"): - skip_next = 1 - continue - if line.startswith("-----BEGIN PGP SIGNATURE"): - inside_signature = 1 - continue - if line.startswith("-----END PGP SIGNATURE"): - inside_signature = 0 - continue - contents += line - inputfile.close() - return contents + with utils.open_file(filename) as f: + data = f.read() + signedfile = SignedFile(data, keyrings=(), require_signature=False) + return signedfile.contents def display_changes(suite, changes_filename): global printed @@ -616,8 +596,8 @@ def main (): if not Cnf.has_key("Examine-Package::Options::%s" % (i)): Cnf["Examine-Package::Options::%s" % (i)] = "" - args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Examine-Package::Options") + args = apt_pkg.parse_commandline(Cnf,Arguments,sys.argv) + Options = Cnf.subtree("Examine-Package::Options") if Options["Help"]: usage() @@ -652,7 +632,7 @@ def main (): # Reset stdout here so future less invocations aren't FUBAR less_fd.close() sys.stdout = stdout_fd - except IOError, e: + except IOError as e: if errno.errorcode[e.errno] == 'EPIPE': utils.warn("[examine-package] Caught EPIPE; skipping.") pass