X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=b9c41ee35dde6fb90f6b398a92004474e2fedcc7;hp=550b9894763f3114d95a9f8277504615fbd18155;hb=a6b39cb5eec2cf7d8a0d756f0090a9d8644443c9;hpb=5ca21f1ba07a6b559395bec8d6bc1e528eb238d1 diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm index 550b989..b9c41ee 100644 --- a/lib/Packages/Page.pm +++ b/lib/Packages/Page.pm @@ -4,9 +4,14 @@ use strict; use warnings; use Data::Dumper; +use Exporter; use Deb::Versions; use Packages::CGI; -use IO::String; +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'; @@ -29,23 +34,6 @@ sub new { return $self; } -sub merge_data { - my ($self, $pkg, $version, $architecture, $data) = @_; - - my %data = ( package => $pkg, - version => $version, - architecture => $architecture ); - chomp($data); - while ($data =~ /^(\S+):\s*(.*)\s*$/mg) { - my ($key, $value) = ($1, $2); - $key =~ tr [A-Z] [a-z]; - $data{$key} = $value; - } -# debug( "Merge package:\n".Dumper(\%data), 3 ); - return $self->merge_package( \%data ); -} - -sub gettext { return $_[0]; } sub split_name_mail { my $string = shift; my ( $name, $email ); @@ -56,7 +44,7 @@ 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; @@ -64,26 +52,15 @@ sub split_name_mail { } sub add_src_data { - my ($self, $src, $version, $data) = @_; - - chomp($data); - my %data = (); - $data =~ s/\n\s+/\377/g; - while ($data =~ /^(\S+):\s*(.*)\s*$/mog) { - my ($key, $value) = ($1, $2); - $key =~ tr [A-Z] [a-z]; - $data{$key} = $value; - } + my ($self, $src, $data) = @_; + + my %data = split /\00/o, $data; - $self->{src}{name} = $src; - $self->{src}{version} = $version; + $self->{src}{package} = $src; + $self->{src}{version} = $data{version}; if ($data{files}) { - $self->{src}{files} = []; - foreach my $sf ( split( /\377/, $data{files} ) ) { - next unless $sf; - # md5, size, name - push @{$self->{src}{files}}, [ split( /\s+/, $sf) ]; - } + my @files = split /\01/so, $data{files}; + $self->{src}{files} = \@files; } $self->{src}{directory} = $data{directory}; my @uploaders; @@ -104,10 +81,23 @@ sub add_src_data { 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 ); 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 ); @@ -117,10 +107,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}; } @@ -131,21 +122,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}, @@ -249,7 +243,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 ); @@ -267,14 +261,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 ) {