X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fexamine_package.py;h=b56785bd084c2a4d1032c52789f0deeaf6b08131;hb=c94ba7558e6768b5b42191ba49fade0916d10a58;hp=87c7ea9fbb14ed959fe7308be787f6971278312f;hpb=9a4fb568340b14698947bfa59b309ae0c67c693a;p=dak.git diff --git a/dak/examine_package.py b/dak/examine_package.py index 87c7ea9f..b56785bd 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: @@ -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): @@ -552,9 +552,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