From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 7 Feb 2010 21:48:00 +0000 (+0100)
Subject: Merge remote branch 'alioth/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ef9d4acb009ad00ca68c2566c0782bf2dd02733f;hp=-c;p=deb%2Fpackages.git

Merge remote branch 'alioth/master' into debian-master
---

ef9d4acb009ad00ca68c2566c0782bf2dd02733f
diff --combined bin/extract_files
index 79b9946,5c57bab..a94fba0
--- a/bin/extract_files
+++ b/bin/extract_files
@@@ -564,10 -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,
@@@ -611,7 -607,7 +611,7 @@@ sub collect_deb 
      return unless $pkg_data;
  
      if (exists $bin_packages{$pkg_data->{bin_name}}{$pkg_data->{bin_version}}{$pkg_data->{bin_arch}}) {
- 	do_warning( "duplicated package $pkg_data->{bin_name}, version {$pkg_data->{bin_version}{$pkg_data->{bin_arch}}" );
+ 	do_warning( "duplicated package $pkg_data->{bin_name}, version $pkg_data->{bin_version}, arch $pkg_data->{bin_arch}" );
  	return;
      } else {
  	$bin_packages{$pkg_data->{bin_name}}{$pkg_data->{bin_version}}{$pkg_data->{bin_arch}} = $pkg_data;