examine-package: make headline() functional

[dak.git] / dak / examine_package.py

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 42a4be77cf50316a3964efc84e3b522b7de98595..f7fadf2a4dc3777ef910262fc3df5778b43f8fc3 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -40,7 +40,6 @@ Script to automate some parts of checking NEW packages
 
 import errno
 import os
-import pg
 import re
 import sys
 import md5
@@ -92,13 +91,13 @@ def escape_if_needed(s):
 def headline(s, level=2, bodyelement=None):
     if use_html:
         if bodyelement:
-            print """<thead>
+            return """<thead>
                 <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s <span class="toggle-msg">(click to toggle)</span></th></tr>
               </thead>"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
         else:
-            print "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
+            return "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
     else:
-        print "---- %s ----" % (s)
+        return "---- %s ----" % (s)
 
 # Colour definitions, 'end' isn't really for use
 
@@ -158,7 +157,7 @@ def foldable_output(title, elementnameprefix, content, norow=False):
     if use_html:
         print """<div id="%(elementnameprefix)s-wrap"><a name="%(elementnameprefix)s" />
                    <table class="infobox rfc822">"""%d
-    headline(title, bodyelement="%(elementnameprefix)s-body"%d)
+    print headline(title, bodyelement="%(elementnameprefix)s-body"%d)
     if use_html:
         print """    <tbody id="%(elementnameprefix)s-body" class="infobody">"""%d
     if norow:
@@ -273,7 +272,7 @@ def read_changes_or_dsc (suite, filename):
 
     dsc_file = utils.open_file(filename)
     try:
-        dsc = utils.parse_changes(filename)
+        dsc = utils.parse_changes(filename, dsc_file=1)
     except:
         return formatted_text("can't parse .dsc control info")
     dsc_file.close()
@@ -307,9 +306,9 @@ def read_changes_or_dsc (suite, filename):
 def create_depends_string (suite, depends_tree):
     result = ""
     if suite == 'experimental':
-        suite_where = " in ('experimental','unstable')"
+        suite_where = "in ('experimental','unstable')"
     else:
-        suite_where = " ='%s'" % suite
+        suite_where = "= '%s'" % suite
 
     comma_count = 1
     session = DBConn().session()
@@ -580,7 +579,7 @@ def main ():
                 elif f.endswith(".deb") or f.endswith(".udeb"):
                     # default to unstable when we don't have a .changes file
                     # perhaps this should be a command line option?
-                    check_deb('unstable', file)
+                    check_deb('unstable', f)
                 elif f.endswith(".dsc"):
                     check_dsc('unstable', f)
                 else: