X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fexamine_package.py;h=7c005783f9a46cff048b24e5eb52e1436050930a;hb=eda72470b56d525f59ba7fe1716a6f27a9b80542;hp=edb9384b6c5be92b0e20ff23544ba1a031922ef4;hpb=e2c4fd7f21c3b33cd7192bded5d6373e0ee90374;p=dak.git
diff --git a/dak/examine_package.py b/dak/examine_package.py
index edb9384b..7c005783 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -60,6 +60,7 @@ import commands
import threading
from daklib import utils
+from daklib.config import Config
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, \
@@ -77,7 +78,7 @@ printed.copyrights = {}
package_relations = {} #: Store relations of packages for later output
# default is to not output html.
-use_html = 0
+use_html = False
################################################################################
@@ -107,7 +108,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:
@@ -238,8 +239,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()
@@ -249,17 +250,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)
@@ -272,12 +273,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
@@ -436,17 +437,17 @@ 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
-def do_command (command, filename, escaped=0):
+def do_command (command, filename, escaped=False):
o = os.popen("%s %s" % (command, filename))
if escaped:
return escaped_text(o.read())
@@ -454,15 +455,25 @@ def do_command (command, filename, escaped=0):
return formatted_text(o.read())
def do_lintian (filename):
+ cnf = Config()
+ cmd = []
+
+ user = cnf.get('Dinstall::UnprivUser') or None
+ if user is not None:
+ cmd.extend(['sudo', '-H', '-u', user])
+
+ color = 'always'
if use_html:
- return do_command("lintian --show-overrides --color html", filename, 1)
- else:
- return do_command("lintian --show-overrides --color always", filename, 1)
+ color = 'html'
+
+ cmd.extend(['lintian', '--show-overrides', '--color', color])
+
+ return do_command(' '.join(cmd), filename, escaped=True)
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]
@@ -478,11 +489,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):
@@ -514,13 +525,14 @@ def get_readme_source (dsc_filename):
return res
def check_dsc (suite, dsc_filename, session = None):
- (dsc) = read_changes_or_dsc(suite, dsc_filename, session)
+ 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):
@@ -552,9 +564,6 @@ 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
@@ -598,15 +607,15 @@ 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()
if Options["Html-Output"]:
global use_html
- use_html = 1
+ use_html = True
stdout_fd = sys.stdout