Merge commit 'alioth/debian-master' into debian-master

diff --git a/.gitignore b/.gitignore
index ec4651513360637d2baa394a824d47a645563fea..5204c115cd67800b0d9f9a713f531fc085ac9b52 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ tmp
 mirror
 *~
 *.ttc
+www-passwords

diff --git a/bin/extract_files b/bin/extract_files
index 269078c0e66964eff6aa8da3c7837ffad350e144..79b99467ac39f6dc659521fd7f8e131474f72c2d 100755 (executable)
--- a/bin/extract_files
+++ b/bin/extract_files
@@ -564,6 +564,10 @@ sub read_deb {
        }
     }
     $cache{$debname} ||= qx/dpkg-deb --info "$debname" control/;
+    unless ( $cache{$debname} ) {
+       do_warning( "extracting control information of file $debname failed" );
+       return;
+    }
     my $control = $cache{$debname};
 
     unless ( $raw_data = $parser->parse_mem( $control,