提交 4e1aad64 编写于 作者: J James Troup

[JJ, r=JT] merge Joerg's outstanding changes.

...@@ -18,6 +18,25 @@ ...@@ -18,6 +18,25 @@
* config/debian/apt.conf: Add hurd-i386 to unstable * config/debian/apt.conf: Add hurd-i386 to unstable
debian-installer stanza. debian-installer stanza.
2007-12-28 Joerg Jaspert <joerg@debian.org>
* KEYEXPIRED is actually a known keyword. We do check it earlier
on and reject in case the sig is bad (or unknown)
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> 2007-08-28 Anthony Towns <ajt@debian.org>
* process_unchecked.py: Add support for automatic BYHAND * process_unchecked.py: Add support for automatic BYHAND
......
...@@ -291,7 +291,7 @@ def do_command (command, filename): ...@@ -291,7 +291,7 @@ def do_command (command, filename):
def print_copyright (deb_filename): def print_copyright (deb_filename):
package = re_package.sub(r'\1', 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] copyright = o.read()[:-1]
if copyright == "": if copyright == "":
...@@ -303,7 +303,7 @@ def print_copyright (deb_filename): ...@@ -303,7 +303,7 @@ def print_copyright (deb_filename):
print "WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory) print "WARNING: wrong doc directory (expected %s, got %s)." % (package, doc_directory)
return 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() copyright = o.read()
copyrightmd5 = md5.md5(copyright).hexdigest() copyrightmd5 = md5.md5(copyright).hexdigest()
...@@ -319,6 +319,8 @@ def check_dsc (dsc_filename): ...@@ -319,6 +319,8 @@ def check_dsc (dsc_filename):
print "---- .dsc file for %s ----" % (dsc_filename) print "---- .dsc file for %s ----" % (dsc_filename)
(dsc) = read_dsc(dsc_filename) (dsc) = read_dsc(dsc_filename)
print dsc print dsc
print "---- lintian check for %s ----" % (dsc_filename)
do_command ("lintian --show-overrides --color always", dsc_filename)
def check_deb (deb_filename): def check_deb (deb_filename):
filename = os.path.basename(deb_filename) filename = os.path.basename(deb_filename)
......
...@@ -1060,7 +1060,7 @@ used.""" ...@@ -1060,7 +1060,7 @@ used."""
# Finally ensure there's not something we don't recognise # Finally ensure there's not something we don't recognise
known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="", known_keywords = Dict(VALIDSIG="",SIG_ID="",GOODSIG="",BADSIG="",ERRSIG="",
SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="", SIGEXPIRED="",KEYREVOKED="",NO_PUBKEY="",BADARMOR="",
NODATA="",NOTATION_DATA="",NOTATION_NAME="") NODATA="",NOTATION_DATA="",NOTATION_NAME="",KEYEXPIRED="")
for keyword in keywords.keys(): for keyword in keywords.keys():
if not known_keywords.has_key(keyword): if not known_keywords.has_key(keyword):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册