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 <joerg@debian.org>

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 87c7ea9fbb14ed959fe7308be787f6971278312f..a46cd4ccb5bfa7f710cef3902b6dae099d9201c5 100755 (executable)
--- 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