X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=eabd8850806d8e7a3d2cbcd49b145fe4eaf87d6a;hb=772655d608069f12e400e0d6c7b7fac76eb98083;hp=87c7ea9fbb14ed959fe7308be787f6971278312f;hpb=6b3c8ccbd61325e2b833ed252b5545a190bff92f;p=dak.git

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 87c7ea9f..eabd8850 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -107,7 +107,7 @@ def headline(s, level=2, bodyelement=None):
         if bodyelement:
             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>\n"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
+              </thead>\n"""%{"bodyelement":bodyelement,"title":utils.html_escape(os.path.basename(s))}
         else:
             return "<h%d>%s</h%d>\n" % (level, utils.html_escape(s), level)
     else:
@@ -462,7 +462,7 @@ def do_lintian (filename):
 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 +478,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):
@@ -515,12 +515,13 @@ def get_readme_source (dsc_filename):
 
 def check_dsc (suite, dsc_filename, session = None):
     (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 +553,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