X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=81191d257616963e492512d62aa94f2e44520f3c;hb=94043b8b93328085a33770825f1e4c4287aa9395;hp=b9ac9af3b1c2acc1b26cd71868ecfb69b2eeb645;hpb=13dc30ace62ff39cb4298d8d8ba5457b043c6100;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py old mode 100644 new mode 100755 index b9ac9af3..81191d25 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -34,7 +34,8 @@ import errno, os, pg, re, sys, md5 import apt_pkg, apt_inst -import daklib.database, daklib.utils, daklib.queue +import daklib.database as database +import daklib.utils as utils ################################################################################ @@ -62,9 +63,9 @@ re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys()))) Cnf = None projectB = None -Cnf = daklib.utils.get_conf() +Cnf = utils.get_conf() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) -daklib.database.init(Cnf, projectB) +database.init(Cnf, projectB) printed_copyrights = {} @@ -225,7 +226,7 @@ def read_control (filename): maintainer = '' arch = '' - deb_file = daklib.utils.open_file(filename) + deb_file = utils.open_file(filename) try: extracts = apt_inst.debExtractControl(deb_file) control = apt_pkg.ParseSection(extracts) @@ -279,9 +280,9 @@ def read_control (filename): def read_changes_or_dsc (filename): dsc = {} - dsc_file = daklib.utils.open_file(filename) + dsc_file = utils.open_file(filename) try: - dsc = daklib.utils.parse_changes(filename) + dsc = utils.parse_changes(filename) except: return formatted_text("can't parse .dsc control info") dsc_file.close() @@ -395,18 +396,18 @@ def do_lintian (filename): def get_copyright (deb_filename): 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)) - copyright = o.read()[:-1] + cright = o.read()[:-1] - if copyright == "": + if cright == "": return formatted_text("WARNING: No copyright found, please check package manually.") - doc_directory = re_doc_directory.sub(r'\1', copyright) + doc_directory = re_doc_directory.sub(r'\1', cright) if package != doc_directory: return formatted_text("WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory)) - o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s 2>/dev/null" % (deb_filename, copyright)) - copyright = o.read() - copyrightmd5 = md5.md5(copyright).hexdigest() + o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s 2>/dev/null" % (deb_filename, cright)) + cright = o.read() + copyrightmd5 = md5.md5(cright).hexdigest() res = "" if printed_copyrights.has_key(copyrightmd5) and printed_copyrights[copyrightmd5] != "%s (%s)" % (package, deb_filename): @@ -414,7 +415,7 @@ def get_copyright (deb_filename): (printed_copyrights[copyrightmd5])) else: printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename) - return res+formatted_text(copyright) + return res+formatted_text(cright) def check_dsc (dsc_filename): (dsc) = read_changes_or_dsc(dsc_filename) @@ -457,7 +458,7 @@ 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 = daklib.utils.open_file (filename) + file = utils.open_file (filename) contents = "" inside_signature = 0 skip_next = 0 @@ -489,19 +490,19 @@ def display_changes(changes_filename): def check_changes (changes_filename): display_changes(changes_filename) - changes = daklib.utils.parse_changes (changes_filename) - files = daklib.utils.build_file_list(changes) - for file in files.keys(): - if file.endswith(".deb") or file.endswith(".udeb"): - check_deb(file) - if file.endswith(".dsc"): - check_dsc(file) + 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) + if f.endswith(".dsc"): + check_dsc(f) # else: => byhand def main (): global Cnf, projectB, db_files, waste, excluded -# Cnf = daklib.utils.get_conf() +# Cnf = utils.get_conf() Arguments = [('h',"help","Examine-Package::Options::Help"), ('H',"html-output","Examine-Package::Options::Html-Output"), @@ -518,7 +519,7 @@ def main (): stdout_fd = sys.stdout - for file in args: + for f in args: try: if not Options["Html-Output"]: # Pipe output for each argument through less @@ -526,14 +527,14 @@ def main (): # -R added to display raw control chars for colour sys.stdout = less_fd try: - if file.endswith(".changes"): - check_changes(file) - elif file.endswith(".deb") or file.endswith(".udeb"): + if f.endswith(".changes"): + check_changes(f) + elif f.endswith(".deb") or f.endswith(".udeb"): check_deb(file) - elif file.endswith(".dsc"): - check_dsc(file) + elif f.endswith(".dsc"): + check_dsc(f) else: - daklib.utils.fubar("Unrecognised file type: '%s'." % (file)) + utils.fubar("Unrecognised file type: '%s'." % (f)) finally: if not Options["Html-Output"]: # Reset stdout here so future less invocations aren't FUBAR @@ -541,12 +542,12 @@ def main (): sys.stdout = stdout_fd except IOError, e: if errno.errorcode[e.errno] == 'EPIPE': - daklib.utils.warn("[examine-package] Caught EPIPE; skipping.") + utils.warn("[examine-package] Caught EPIPE; skipping.") pass else: raise except KeyboardInterrupt: - daklib.utils.warn("[examine-package] Caught C-c; skipping.") + utils.warn("[examine-package] Caught C-c; skipping.") pass #######################################################################################