X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=dak%2Fexamine_package.py;h=383afcecf6dfe9de585d6ce98755aaf21e41f0e5;hb=e7de16356672279508b4cd6259ff5fcee7900141;hp=7abcb3190b736fc17ee85c3e32d29098c7a9eb31;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 7abcb319..383afcec 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -32,10 +32,9 @@
 
 ################################################################################
 
-import errno, os, re, sys
-import utils
+import errno, os, pg, re, sys, md5
 import apt_pkg, apt_inst
-import pg, database
+import daklib.database, daklib.utils
 
 ################################################################################
 
@@ -83,6 +82,8 @@ Cnf = daklib.utils.get_conf()
 projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
 daklib.database.init(Cnf, projectB)
 
+printed_copyrights = {}
+
 ################################################################################
 
 def usage (exit_code=0):
@@ -290,7 +291,7 @@ def do_command (command, filename):
 
 def print_copyright (deb_filename):
     package = re_package.sub(r'\1', deb_filename)
-    o = os.popen("ar p %s data.tar.gz | tar tzvf - | egrep 'usr(/share)?/doc/[^/]*/copyright' | awk '{ print $6 }' | head -n 1" % (deb_filename))
+    o = os.popen("dpkg-deb -c %s | egrep 'usr(/share)?/doc/[^/]*/copyright' | awk '{print $6}' | head -n 1" % (deb_filename))
     copyright = o.read()[:-1]
 
     if copyright == "":
@@ -302,13 +303,24 @@ def print_copyright (deb_filename):
         print "WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory)
         return
 
-    o = os.popen("ar p %s data.tar.gz | tar xzOf - %s" % (deb_filename, copyright))
-    print o.read()
+    o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s 2>/dev/null" % (deb_filename, copyright))
+    copyright = o.read()
+    copyrightmd5 = md5.md5(copyright).hexdigest()
+
+    if printed_copyrights.has_key(copyrightmd5) and printed_copyrights[copyrightmd5] != "%s (%s)" % (package, deb_filename):
+        print "NOTE: Copyright is the same as %s.\n" % \
+		(printed_copyrights[copyrightmd5])
+    else:
+	printed_copyrights[copyrightmd5] = "%s (%s)" % (package, deb_filename)
+
+    print copyright
 
 def check_dsc (dsc_filename):
     print "---- .dsc file for %s ----" % (dsc_filename)
     (dsc) = read_dsc(dsc_filename)
     print dsc
+    print "---- lintian check for %s ----" % (dsc_filename)
+    do_command("lintian --show-overrides --color always", dsc_filename)
 
 def check_deb (deb_filename):
     filename = os.path.basename(deb_filename)
@@ -323,11 +335,11 @@ def check_deb (deb_filename):
     output_deb_info(deb_filename)
 
     if is_a_udeb:
-	print "---- skipping lintian check for µdeb ----"
+	print "---- skipping lintian check for udeb ----"
 	print 
     else:
 	print "---- lintian check for %s ----" % (filename)
-        do_command ("lintian", deb_filename)
+        do_command ("lintian --show-overrides --color always", deb_filename)
 	print "---- linda check for %s ----" % (filename)
         do_command ("linda", deb_filename)
 
@@ -335,7 +347,7 @@ def check_deb (deb_filename):
     do_command ("dpkg -c", deb_filename)
 
     if is_a_udeb:
-	print "---- skipping copyright for µdeb ----"
+	print "---- skipping copyright for udeb ----"
     else:
 	print "---- copyright of %s ----" % (filename)
         print_copyright(deb_filename)