X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=4772f8355e6074ba08288e76d9773e31bbc36c20;hb=7484a3adc951c00fd18c530bb88007b5d4632808;hp=999826f4ab6e9ece8aac9612b264ca163b0162cd;hpb=91edc66c5f872b41114dc61bdefc6d89c205a183;p=deb%2Fpackages.git diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm index 999826f..4772f83 100644 --- a/lib/Packages/Page.pm +++ b/lib/Packages/Page.pm @@ -1,6 +1,17 @@ package Packages::Page; +use strict; +use warnings; + +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 ); +our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] ); our $ARCHIVE_DEFAULT = ''; our $SECTION_DEFAULT = 'main'; @@ -23,43 +34,149 @@ sub new { return $self; } -sub merge_data { +sub split_name_mail { + my $string = shift; + my ( $name, $email ); + if ($string =~ /(.*?)\s*<(.*)>/o) { + $name = $1; + $email = $2; + } elsif ($string =~ /^[\w.-]*@[\w.-]*$/o) { + $name = $string; + $email = $string; + } else { + $name = N_( 'package has bad maintainer field' ); + $email = ''; + } + $name =~ s/\s+$//o; + return ($name, $email); +} + +sub override_maint { my ($self, $data) = @_; - local $/ = ""; - open DATA, '<', \$data - or return; - my $merged = 0; - while () { - next if /^\s*$/; - my %data = (); - chomp; - s/\n /\377/g; - while (/^(\S+):\s*(.*)\s*$/mg) { - my ($key, $value) = ($1, $2); - $value =~ s/\377/\n /g; - $key =~ tr [A-Z] [a-z]; - $data{$key} = $value; - } - $merged += $self->merge_package( \%data ); - } - close DATA; - return $merged; -} - -our @TAKE_NEWEST = qw( description essential priority section subsection tags ); -our @STORE_ALL = qw( version source installed-size size filename md5sum + 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) = @_; + + my %data = split /\00/o, $data; + + $self->{src}{package} = $src; + $self->{src}{version} = $data{version}; + if ($data{files}) { + my @files = split /\01/so, $data{files}; + $self->{src}{files} = \@files; + } + $self->{src}{directory} = $data{directory}; + my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields(\%data); + $self->{src}{uploaders} = $uploaders; + $self->{src}{orig_uploaders} = $orig_uploaders if @$orig_uploaders; + + return 1; +} + +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 sha1 sha256 task origin bugs suite archive section ); our @DEP_FIELDS = qw( depends pre-depends recommends suggests enhances provides conflicts ); sub merge_package { my ($self, $data) = @_; - ($data{package} && $data{version} && $data{architecture}) || return; - $self->{package} ||= $data{package}; - ($self->{package} eq $data{package}) || return; + ($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 ) 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 ) if DEBUG; foreach my $key (@TAKE_NEWEST) { $self->{data}{$key} = $data->{$key}; } @@ -70,22 +187,28 @@ sub merge_package { foreach my $key (@DEP_FIELDS) { $self->normalize_dependencies($key, $data); } - $self->{newest} = $data->{version}; + $self->{newest} = $version; return 1; } - if (my $is_newest = - (version_cmp( $data->{version}, $self->{newest} ) > 0)) { - $self->{newest} = $data->{version}; + debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ) if DEBUG; + my $is_newest; + 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 ) if DEBUG; if (!$self->{versions}{$data->{architecture}} || $is_newest || (version_cmp( $data->{version}, - $self->{versions}{$data->{architecture}} ) > 0)) { + $self->{versions}{$data->{architecture}}{version} ) > 0)) { foreach my $key (@STORE_ALL) { $self->{versions}{$data->{architecture}}{$key} = $data->{$key}; @@ -95,6 +218,7 @@ sub merge_package { } } + return 1; } sub normalize_dependencies { @@ -128,19 +252,36 @@ sub parse_deps { return (\@dep_and_norm, \@dep_and); } +sub get_newest { + my ($self, $field) = @_; + + return $self->{data}{$field}; +} +sub get_src { + my ($self, $field) = @_; + + return $self->{src}{$field}; +} + +sub get_architectures { + my ($self) = @_; + + return keys %{$self->{versions}}; +} + sub get_arch_field { my ($self, $field) = @_; - my @result; + my %result; foreach (sort keys %{$self->{versions}}) { - push(@result, $self->{versions}{$_}{$field}) - if $self->{versions}{$_}{$field}; + $result{$_} = $self->{versions}{$_}{$field} + if $self->{versions}{$_}{$field}; } - return \@result; + return \%result; } -sub get_version_string { +sub get_versions { my ($self) = @_; my %versions; @@ -150,7 +291,15 @@ sub get_version_string { push @{$versions{$version}}, $_; } - my @versions = version_sort keys %versions; + return \%versions; +} + +sub get_version_string { + my ($self) = @_; + + my $versions = $self->get_versions; + my @versions = version_sort keys %$versions; + my (@v_str, $v_str, $v_str_arch); if ( scalar @versions == 1 ) { @v_str = ( [ $versions[0], undef ] ); $v_str = $versions[0]; @@ -158,8 +307,8 @@ sub get_version_string { } else { my @v_str_arch; foreach ( @versions ) { - push @v_str, [ $_, $versions{$_} ]; - push @v_str_arch, "$_ [".join(', ', @{$versions{$_}})."]"; + push @v_str, [ $_, $versions->{$_} ]; + push @v_str_arch, "$_ [".join(', ', sort @{$versions->{$_}})."]"; } $v_str_arch = join( ", ", @v_str_arch ); $v_str = join( ", ", @versions ); @@ -171,19 +320,20 @@ sub get_version_string { sub get_dep_field { my ($self, $dep_field) = @_; - my @architectures = ( keys %{$self->{versions}} ); + my @architectures = $self->get_architectures; my ( %dep_pkgs, %arch_deps ); foreach my $a ( @architectures ) { next unless exists $self->{dep_fields}{$a}{$dep_field}; - my (@a_deps_norm, @a_deps) = @{$self->{dep_fields}{$a}{$type}}; - 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]}++; + 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 ) 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; -# print Dumper( \%dep_pkgs, \%arch_deps ); + # debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ) if DEBUG; my @deps; if ( %dep_pkgs ) { @@ -218,7 +368,7 @@ sub get_dep_field { push @deps, [ $is_old_pkgs, @res_pkgs ]; } } - return @deps; + return \@deps; } sub _compute_arch_str {