From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 24 Dec 2007 18:29:25 +0000 (+0000)
Subject: Fix examine_packages
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9e8be31466d5673f0391c8eb13a40969a371308d;p=dak.git

Fix examine_packages
---

9e8be31466d5673f0391c8eb13a40969a371308d
diff --cc ChangeLog
index 7f642169,6da92759..10fa3c44
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,3 +1,17 @@@
++2007-12-24  Joerg Jaspert  <joerg@debian.org>
++
++	* Also run lintian on the .dsc file to check the source itself.
++
++	* Fix the direct usage of ar | tar etc to get the copyright file
++	and use dpkg-deb, which is made for this and makes us able to
++	process data.tar.bz2 (or whatever format it will be in the
++	future).
++
 +2007-12-21  Joerg Jaspert  <joerg@debian.org>
 +
 +	* Remove the (now useless) check for a pre-depends on dpkg for
 +	  binaries that contain bzip2 compressed data tarballs.
 +
  2007-08-28  Anthony Towns  <ajt@debian.org>
  
  	* process_unchecked.py: Add support for automatic BYHAND
diff --cc dak/examine_package.py
index c1de7576,c1de7576..48163156
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@@ -291,7 -291,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 == "":
@@@ -303,7 -303,7 +303,7 @@@
          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))
++    o = os.popen("dpkg-deb --fsys-tarfile %s | tar xvOf - %s" % (deb_filename, copyright))
      copyright = o.read()
      copyrightmd5 = md5.md5(copyright).hexdigest()
  
@@@ -319,6 -319,6 +319,8 @@@ 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)