X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=inline;f=dak%2Fexamine_package.py;h=edb9384b6c5be92b0e20ff23544ba1a031922ef4;hb=ed86dd7428fd8b134f9186dfaa1553113a901708;hp=0d98497ec1fc39797125e33241e33a8de58e4348;hpb=48dc11caafef8b296d2b7d781e2b23b12364abcb;p=dak.git
diff --git a/dak/examine_package.py b/dak/examine_package.py
index 0d98497e..edb9384b 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
################################################################################
@@ -117,6 +119,7 @@ ansi_colours = {
'main': "\033[36m",
'contrib': "\033[33m",
'nonfree': "\033[31m",
+ 'provides': "\033[35m",
'arch': "\033[32m",
'end': "\033[0m",
'bold': "\033[1m",
@@ -127,6 +130,7 @@ html_colours = {
'main': ('',""),
'contrib': ('',""),
'nonfree': ('',""),
+ 'provides': ('',""),
'arch': ('',""),
'bold': ('',""),
'maintainer': ('',""),
@@ -322,6 +326,30 @@ def read_changes_or_dsc (suite, filename, session = None):
filecontents = '\n'.join(map(lambda x: format_field(x,dsc[x.lower()]), keysinorder))+'\n'
return filecontents
+def get_provides(suite):
+ provides = set()
+ session = DBConn().session()
+ query = '''SELECT DISTINCT value
+ FROM binaries_metadata m
+ JOIN bin_associations b
+ ON b.bin = m.bin_id
+ WHERE key_id = (
+ SELECT key_id
+ FROM metadata_keys
+ WHERE key = 'Provides' )
+ AND b.suite = (
+ SELECT id
+ FROM suite
+ WHERE suite_name = '%(suite)s'
+ OR codename = '%(suite)s')''' % \
+ {'suite': suite}
+ for p in session.execute(query):
+ for e in p:
+ for i in e.split(','):
+ provides.add(i.strip())
+ session.close()
+ return provides
+
def create_depends_string (suite, depends_tree, session = None):
result = ""
if suite == 'experimental':
@@ -329,6 +357,7 @@ def create_depends_string (suite, depends_tree, session = None):
else:
suite_list = [suite]
+ provides = set()
comma_count = 1
for l in depends_tree:
if (comma_count >= 2):
@@ -339,7 +368,8 @@ def create_depends_string (suite, depends_tree, session = None):
result += " | "
# doesn't do version lookup yet.
- component = get_component_by_package_suite(d['name'], suite_list, session)
+ component = get_component_by_package_suite(d['name'], suite_list, \
+ session = session)
if component is not None:
adepends = d['name']
if d['version'] != '' :
@@ -355,7 +385,12 @@ def create_depends_string (suite, depends_tree, session = None):
adepends = d['name']
if d['version'] != '' :
adepends += " (%s)" % (d['version'])
- result += colour_output(adepends, "bold")
+ if not provides:
+ provides = get_provides(suite)
+ if d['name'] in provides:
+ result += colour_output(adepends, "provides")
+ else:
+ result += colour_output(adepends, "bold")
or_count += 1
comma_count += 1
return result
@@ -472,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)
@@ -525,30 +560,10 @@ def check_deb (suite, deb_filename, session = None):
# 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
@@ -619,7 +634,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