X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=eabd8850806d8e7a3d2cbcd49b145fe4eaf87d6a;hb=94dcb438da061093e80d33a4f3485c45314e06ea;hp=cbe782743db1e8fa34403f91284fb4f3dfa0d127;hpb=38d6fa647e0f9bfcfb60c219ba52473793e3396c;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index cbe78274..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 """ %(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: @@ -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):