X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=4772f8355e6074ba08288e76d9773e31bbc36c20;hb=655b2eb3a319370039897127a65666b536af901e;hp=c44a099ffe9e7d19acab17c472e87ff60af84683;hpb=9f26e8bcb912da43661983f13714c3e56f406007;p=deb%2Fpackages.git diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm index c44a099..4772f83 100644 --- a/lib/Packages/Page.pm +++ b/lib/Packages/Page.pm @@ -7,6 +7,7 @@ use Data::Dumper; use Exporter; use Deb::Versions; use Packages::CGI; +use Packages::I18N::Locale; our @ISA = qw( Exporter ); our @EXPORT_OK = qw( split_name_mail parse_deps ); @@ -33,7 +34,6 @@ sub new { return $self; } -sub gettext { return $_[0]; } sub split_name_mail { my $string = shift; my ( $name, $email ); @@ -44,13 +44,89 @@ sub split_name_mail { $name = $string; $email = $string; } else { - $name = gettext( 'package has bad maintainer field' ); + $name = N_( 'package has bad maintainer field' ); $email = ''; } $name =~ s/\s+$//o; return ($name, $email); } +sub override_maint { + my ($self, $data) = @_; + + return if $data->{'original-maintainer'}; + return unless $data->{maintainer}; + + my ($name, $mail) = split_name_mail( $data->{maintainer} ); + + # taken from etc/pkgbinarymangler/maintainermangler.overrides + return if $mail =~ /\@(ubuntu\.com|canonical\.com|lists\.ubuntu\.com|lists\.canonical\.com|ubuntu\.com\.au|kubuntu\.org)^/o; + return if $mail =~ /^(lamont\@debian\.org|q-funk\@iki\.fi|cjwatson\@debian\.org|patrick\.matthaei\@web\.de)^/o; + + if ($mail eq 'adconrad@0c3.net') { + $data->{maintainer} = 'Adam Conrad '; + return 1; + } + if ($mail eq 'mpitt@debian.org') { + $data->{maintainer} = 'Martin Pitt '; + return 1; + } + + $data->{'original-maintainer'} = $data->{maintainer}; + foreach ($data->{section}) { + /^(main|restricted)$/ && do { + $data->{maintainer} = 'Ubuntu Core Developers '; + last; + }; + /^(uni|multi)verse$/ && do { + $data->{maintainer} = 'Ubuntu MOTU Developers '; + last; + }; + + die 'Huh?'; + } + + return 1; +} + +sub handle_maintainer_fields { + my ($self, $data) = @_; + my (@uploaders, @orig_uploaders); + + if ($data->{'original-maintainer'}) { + push @orig_uploaders, [ split_name_mail( $data->{'original-maintainer'} ) ]; + + $data->{uploaders} ||= ''; + my @up_tmp = split( /\s*,\s*/, + $data->{uploaders} ); + foreach my $up (@up_tmp) { + push @orig_uploaders, [ split_name_mail( $up ) ]; + } + if ($data->{maintainer} ||= '') { + push @uploaders, [ split_name_mail( $data->{maintainer} ) ]; + } + } else { + if ($data->{maintainer} ||= '') { + if ($self->override_maint($data)) { + return $self->handle_maintainer_fields($data); + } + + push @uploaders, [ split_name_mail( $data->{maintainer} ) ]; + } + if ($data->{uploaders}) { + my @up_tmp = split( /\s*,\s*/, + $data->{uploaders} ); + foreach my $up (@up_tmp) { + if ($up ne $data->{maintainer}) { # weed out duplicates + push @uploaders, [ split_name_mail( $up ) ]; + } + } + } + } + + return (\@uploaders, \@orig_uploaders); +} + sub add_src_data { my ($self, $src, $data) = @_; @@ -61,31 +137,32 @@ sub add_src_data { if ($data{files}) { my @files = split /\01/so, $data{files}; $self->{src}{files} = \@files; - print @{$self->{src}{files}}; } $self->{src}{directory} = $data{directory}; - my @uploaders; - if ($data{maintainer} ||= '') { - push @uploaders, [ split_name_mail( $data{maintainer} ) ]; - } - if ($data{uploaders}) { - my @up_tmp = split( /\s*,\s*/, - $data{uploaders} ); - foreach my $up (@up_tmp) { - if ($up ne $data{maintainer}) { # weed out duplicates - push @uploaders, [ split_name_mail( $up ) ]; - } - } - } - $self->{src}{uploaders} = \@uploaders; + my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields(\%data); + $self->{src}{uploaders} = $uploaders; + $self->{src}{orig_uploaders} = $orig_uploaders if @$orig_uploaders; return 1; } -our @TAKE_NEWEST = qw( description essential priority section subsection tag - archive source source-version ); +sub add_provided_by { + my ($self, $provided_by) = @_; + + $self->{provided_by} ||= []; + push @{$self->{provided_by}}, @$provided_by; +} + +sub is_virtual { + my ($self) = @_; + + return (exists($self->{provided_by}) && !exists($self->{versions})); +} + +our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag + archive source source-version homepage maintainer original-maintainer uploaders); our @STORE_ALL = qw( version source source-version installed-size size - filename md5sum + filename md5sum sha1 sha256 task origin bugs suite archive section ); our @DEP_FIELDS = qw( depends pre-depends recommends suggests enhances provides conflicts ); @@ -95,10 +172,11 @@ sub merge_package { ($data->{package} && $data->{version} && $data->{architecture}) || return; $self->{package} ||= $data->{package}; ($self->{package} eq $data->{package}) || return; - debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ); + debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ) if DEBUG; + (my $version = $data->{version}) =~ s/\+b\d+$//o; # strip binNMU number unless ($self->{newest}) { - debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ); + debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG; foreach my $key (@TAKE_NEWEST) { $self->{data}{$key} = $data->{$key}; } @@ -109,21 +187,24 @@ sub merge_package { foreach my $key (@DEP_FIELDS) { $self->normalize_dependencies($key, $data); } - $self->{newest} = $data->{version}; + $self->{newest} = $version; return 1; } - debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ); + debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ) if DEBUG; my $is_newest; - if ($is_newest = - (version_cmp( $data->{version}, $self->{newest} ) > 0)) { - $self->{newest} = $data->{version}; + my $cmp = version_cmp( $version, $self->{newest} ); + # packages from the central archive are preferred over all + # others with the same version number but from other archives + if ($is_newest = ($cmp > 0) + || (!$cmp && ($data->{archive} eq 'us') && ($self->{data}{archive} ne 'us'))) { + $self->{newest} = $version; foreach my $key (@TAKE_NEWEST) { $self->{data}{$key} = $data->{$key}; } } - debug( "is_newest= ".($is_newest||0), 3 ); + debug( "is_newest= ".($is_newest||0), 3 ) if DEBUG; if (!$self->{versions}{$data->{architecture}} || $is_newest || (version_cmp( $data->{version}, @@ -227,7 +308,7 @@ sub get_version_string { my @v_str_arch; foreach ( @versions ) { push @v_str, [ $_, $versions->{$_} ]; - push @v_str_arch, "$_ [".join(', ', @{$versions->{$_}})."]"; + push @v_str_arch, "$_ [".join(', ', sort @{$versions->{$_}})."]"; } $v_str_arch = join( ", ", @v_str_arch ); $v_str = join( ", ", @versions ); @@ -245,14 +326,14 @@ sub get_dep_field { foreach my $a ( @architectures ) { next unless exists $self->{dep_fields}{$a}{$dep_field}; my ($a_deps_norm, $a_deps) = @{$self->{dep_fields}{$a}{$dep_field}}; -# debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 ); +# debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 ) if DEBUG; for ( my $i=0; $i < @$a_deps; $i++ ) { # splitted by , $dep_pkgs{$a_deps_norm->[$i]} = $a_deps->[$i]; $arch_deps{$a}{$a_deps_norm->[$i]}++; } } @architectures = sort keys %arch_deps; - # debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ); + # debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ) if DEBUG; my @deps; if ( %dep_pkgs ) {