X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=55b55aa9a7ce4fd447b85b71657e0caeea97a919;hb=bd2f59abe3833efd703db5e075c8ce67f0b7864a;hp=8d97fba00dba0ccf04b3f1161ba97d5bf909f45f;hpb=6be7c79d88f73735ab10b0f0aeefdac68a35bc65;p=dak.git

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 8d97fba0..55b55aa9 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -40,13 +40,16 @@ Script to automate some parts of checking NEW packages
 
 import errno
 import os
-import pg
 import re
 import sys
 import md5
-import apt_pkg, apt_inst
-from daklib import database
+import apt_pkg
+import apt_inst
+import shutil
+import commands
+
 from daklib import utils
+from daklib.dbconn import DBConn, get_binary_from_name_suite
 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
@@ -54,11 +57,7 @@ from daklib.regexes import html_escaping, re_html_escaping, re_version, re_space
 ################################################################################
 
 Cnf = None
-projectB = None
-
 Cnf = utils.get_conf()
-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
@@ -312,6 +311,7 @@ def create_depends_string (suite, depends_tree):
         suite_where = " ='%s'" % suite
 
     comma_count = 1
+    session = DBConn().session()
     for l in depends_tree:
         if (comma_count >= 2):
             result += ", "
@@ -321,10 +321,9 @@ def create_depends_string (suite, depends_tree):
                 result += " | "
             # doesn't do version lookup yet.
 
-            q = projectB.query("SELECT DISTINCT(b.package), b.version, c.name, su.suite_name FROM  binaries b, files fi, location l, component c, bin_associations ba, suite su WHERE b.package='%s' AND b.file = fi.id AND fi.location = l.id AND l.component = c.id AND ba.bin=b.id AND ba.suite = su.id AND su.suite_name %s ORDER BY b.version desc" % (d['name'], suite_where))
-            ql = q.getresult()
-            if ql:
-                i = ql[0]
+            res = get_binary_from_name_suite(d['name'], suite_where)
+            if res.rowcount > 0:
+                i = res.fetchone()
 
                 adepends = d['name']
                 if d['version'] != '' :
@@ -352,6 +351,7 @@ def output_package_relations ():
 
     if len(package_relations) < 2:
         # Only list something if we have more than one binary to compare
+        package_relations.clear()
         return
 
     to_print = ""
@@ -359,7 +359,7 @@ def output_package_relations ():
         for relation in package_relations[package]:
             to_print += "%-15s: (%s) %s\n" % (package, relation, package_relations[package][relation])
 
-    package_relations={}
+    package_relations.clear()
     foldable_output("Package relations", "relations", to_print)
 
 def output_deb_info(suite, filename, packagename):
@@ -432,10 +432,39 @@ def get_copyright (deb_filename):
         printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename)
     return res+formatted_text(cright)
 
+def get_readme_source (dsc_filename):
+    tempdir = utils.temp_dirname()
+    os.rmdir(tempdir)
+
+    cmd = "dpkg-source --no-check --no-copy -x %s %s" % (dsc_filename, tempdir)
+    (result, output) = commands.getstatusoutput(cmd)
+    if (result != 0):
+        res = "How is education supposed to make me feel smarter? Besides, every time I learn something new, it pushes some\n old stuff out of my brain. Remember when I took that home winemaking course, and I forgot how to drive?\n"
+        res += "Error, couldn't extract source, WTF?\n"
+        res += "'dpkg-source -x' failed. return code: %s.\n\n" % (result)
+        res += output
+        return res
+
+    path = os.path.join(tempdir, 'debian/README.source')
+    res = ""
+    if os.path.exists(path):
+        res += do_command("cat", path)
+    else:
+        res += "No README.source in this package\n\n"
+
+    try:
+        shutil.rmtree(tempdir)
+    except OSError, e:
+        if errno.errorcode[e.errno] != 'EACCES':
+            res += "%s: couldn't remove tmp dir %s for source tree." % (dsc_filename, tempdir)
+
+    return res
+
 def check_dsc (suite, dsc_filename):
     (dsc) = read_changes_or_dsc(suite, dsc_filename)
     foldable_output(dsc_filename, "dsc", dsc, norow=True)
     foldable_output("lintian check for %s" % dsc_filename, "source-lintian", do_lintian(dsc_filename))
+    foldable_output("README.source for %s" % dsc_filename, "source-readmesource", get_readme_source(dsc_filename))
 
 def check_deb (suite, deb_filename):
     filename = os.path.basename(deb_filename)
@@ -518,7 +547,7 @@ def check_changes (changes_filename):
         # else: => byhand
 
 def main ():
-    global Cnf, projectB, db_files, waste, excluded
+    global Cnf, db_files, waste, excluded
 
 #    Cnf = utils.get_conf()