The following commit has been merged in the debian-master branch:
commit ef9d4acb009ad00ca68c2566c0782bf2dd02733f
Merge: 28e5e3b92d691be9330be9327a39286293f24647 
f41adf504622cd6f777cac9bca6285407dc97c12
Author: Frank Lichtenheld <[email protected]>
Date:   Sun Feb 7 22:48:00 2010 +0100

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

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;

-- 
APT Archive Web-Frontend (Alioth repository)


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to