From: Joerg Jaspert Date: Sun, 12 Aug 2012 11:59:14 +0000 (+0200) Subject: Merge remote-tracking branch 'ansgar/pu/multiarchive-2' X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=commitdiff_plain;h=f64c8d98c006cb0d41db2727753063c8e97a6079;hp=5a7eb60006644e5ec089f3c71c25a0404f0659fe Merge remote-tracking branch 'ansgar/pu/multiarchive-2' * ansgar/pu/multiarchive-2: dak/examine_package.py: dereference symlink by using ls -lL dak/examine_package.py: use basename of .deb to get package name Signed-off-by: Joerg Jaspert --- diff --git a/dak/examine_package.py b/dak/examine_package.py index 87c7ea9f..a46cd4cc 100755 --- a/dak/examine_package.py +++ b/dak/examine_package.py @@ -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] @@ -553,7 +553,7 @@ def check_deb (suite, deb_filename, session = None): "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)) + "binary-%s-file-listing"%packagename, do_command("ls -Ll", deb_filename)) return result