Merge commit 'origin/master' into debian-master

diff --git a/bin/newpkg_info b/bin/newpkg_info
index e2f36aef9790dcd4d7ec14136a9abb6d8fec73ac..700a07989b5345cda1c63ab743655cb61e18d293 100755 (executable)
--- a/bin/newpkg_info
+++ b/bin/newpkg_info
@@ -64,9 +64,13 @@ for (my $age = 0; $age < 7; $age++) {
 
     my %archives = map { $_ => 1 } qw( us security non-US );
     foreach (sort keys %changes) {
-       my $entry = read_entry_simple( \%packages, $_, \%archives, $suite)
-           or die "Fatal Error: Can't find entry for package $_\n";
-       shift @$entry; # remove virtual pkg info
+       my $entry = [];
+       if ($changes{$_} == 1) {
+           $entry = read_entry_simple( \%packages, $_, \%archives, $suite);
+           die "Fatal Error: Can't find entry for package $_\n"
+               unless @$entry;
+           shift @$entry; # remove virtual pkg info
+       }
        print CHANGES join(" ", $_, $age, @$entry)."\n";
        print "Wrote entry: ".join(" ", $_, $age, @$entry)."\n";
     }

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 3c0694ab14f40e498ebf9f113fd803b19d81bb18..9639e92deff877d4f344385e1d1b81a4ee295977 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -271,7 +271,7 @@ sub do_dispatch {
                                 array => ',', var => \@archs, replace =>
                                 { any => \@ARCHITECTURES } },
                       format => { default => 'html', match => '^([\w.]+)$',  },
-                  mode => { default => undef, match => '^(\w+)$',  },
+                  mode => { default => '', match => '^(\w+)$',  },
                   sort_by => { default => 'file', match => '^(\w+)$', },
                   );
     my %opts;

diff --git a/lib/Packages/DoDownload.pm b/lib/Packages/DoDownload.pm
index 7c59272085c3db58e923c24562ae5be720c3b128..bc7dbab0e6d57a78783f81ede244f65e76cc6876 100644 (file)
--- a/lib/Packages/DoDownload.pm
+++ b/lib/Packages/DoDownload.pm
@@ -85,9 +85,11 @@ sub do_download {
            $page_content->{archive} = $archive;
            $page_content->{suite} = $suite;
            $page_content->{pkg} = $pkg;
-           $page_content->{pkgsize} = sprintf( '%.1f', floor(($data{size}/102.4)+0.5)/10 );
-           $page_content->{pkgsize_unit} = _g( 'kByte' );
-           if ($page_content->{pkgsize} > 1024) {
+           my $pkgsize = floor(($data{size}/102.4)+0.5)/10;
+           if ($pkgsize < 1024) {
+               $page_content->{pkgsize} = sprintf( '%.1f', $pkgsize );
+               $page_content->{pkgsize_unit} = _g( 'kByte' );
+           } else {
                $page_content->{pkgsize} = sprintf( '%.1f', floor(($data{size}/(102.4*102.4))+0.5)/100 );
                $page_content->{pkgsize_unit} = _g( 'MByte' );
            }

diff --git a/lib/Packages/DoFilelist.pm b/lib/Packages/DoFilelist.pm
index c8061905add7ef5f6a806b5d815ec3d3b4387a89..f76efb91e2bfc429cab119a7ea211ef26b784be4 100644 (file)
--- a/lib/Packages/DoFilelist.pm
+++ b/lib/Packages/DoFilelist.pm
@@ -51,7 +51,7 @@ sub do_filelist {
                fatal_error( _g( "No such package in this suite on this architecture." ) );
            } else {
                my @files = unpack "L/(CC/a)", $contents{$pkg};
-               my $file;
+               my $file = '';
 
                $page_content->{files} = [];
                for (my $i=0; $i<scalar @files;) {

diff --git a/lib/Packages/DoNewPkg.pm b/lib/Packages/DoNewPkg.pm
index c9e0ca23f009f79615048c7d1a4519230667e2e7..60e6876c6274c53a044c933e9b48128e0d842bc9 100644 (file)
--- a/lib/Packages/DoNewPkg.pm
+++ b/lib/Packages/DoNewPkg.pm
@@ -30,7 +30,7 @@ sub do_newpkg {
 
     my $sort_func = sub { $_[0][0] cmp $_[1][0] };
     $sort_func = sub { $_[0][1] <=> $_[1][1] or $_[0][0] cmp $_[1][0] }
-    if $opts->{mode} eq 'byage';
+       if $opts->{mode} eq 'byage';
 
     my $suite = $opts->{suite}[0];
     my $one_archive = @{$opts->{archive}} == 1 ?
@@ -46,6 +46,7 @@ sub do_newpkg {
        chomp;
        my @data = split /\s/, $_, 10;
 
+       next unless $data[2]; #removed packages
        next unless $data[3] eq $suite;
        next if $one_archive and $data[2] ne $one_archive;
        next if $one_section and $data[5] ne $one_section;

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 611d65e4e2e1aedea02c7c5f366f078c07046acf..1f8a0178c7ea1e81a83b7020d717b3aa8662dff3 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -126,7 +126,7 @@ sub do_show {
 
                        my $did = $page->get_newest( 'description' );
                        my $desc_md5 = $page->get_newest( 'description-md5' );
-                       my @complete_tags = split(/, /, $page->get_newest( 'tag' ));
+                       my @complete_tags = split(/, /, $page->get_newest( 'tag' )||'' );
                        my @tags;
                        foreach (@complete_tags) {
                            my ($facet, $tag) = split( /::/, $_, 2);

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 021f0fd46196fad9847ce57616e3ebd47da5f802..6c0d79997fd1fdbe0c0f43666f8417587c075314 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -82,7 +82,7 @@ sub read_entry_all {
        }
     }
 
-    foreach (split /\000/o, $result) {
+    foreach (split(/\000/o, $result||'')) {
        my @data = split ( /\s/o, $_, 8 );
        debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
        if ($opts->{h_suites}{$data[1]}
@@ -199,7 +199,7 @@ sub do_names_search {
 }
 
 sub do_xapian_search {
-    my ($keywords, $db, $did2pkg, $packages, $read_entry, $opts,
+    my ($keywords, $dbpath, $did2pkg, $packages, $read_entry, $opts,
        $results, $non_results) = @_;
 
 # NOTE: this needs to correspond with parse-packages!
@@ -211,7 +211,7 @@ sub do_xapian_search {
     my $stemmer = Lingua::Stem->new();
     my $stemmed_keywords = $stemmer->stem( @tmp );
 
-    my $db = Search::Xapian::Database->new( $db );
+    my $db = Search::Xapian::Database->new( $dbpath );
     my $enq = $db->enquire( OP_OR, @$keywords, @$stemmed_keywords );
     debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
     my @matches = $enq->matches(0, 999);
@@ -242,9 +242,9 @@ sub do_xapian_search {
 }
 
 sub find_similar {
-    my ($pkg, $db, $did2pkg) = @_;
+    my ($pkg, $dbpath, $did2pkg) = @_;
 
-    my $db = Search::Xapian::Database->new( $db );
+    my $db = Search::Xapian::Database->new( $dbpath );
     my $enq = $db->enquire( "P$pkg" );
     debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
     my $first_match = ($enq->matches(0,1))[0]->get_document();
@@ -253,7 +253,7 @@ sub find_similar {
     my $term_it = $first_match->termlist_begin();
     my $term_end = $first_match->termlist_end();
 
-    for ($term_it; $term_it ne $term_end; $term_it++) {
+    for (; $term_it ne $term_end; $term_it++) {
        debug( "TERM: ".$term_it->get_termname(), 3);
        push @terms, $term_it->get_termname();
     }
@@ -262,8 +262,8 @@ sub find_similar {
     debug( "Xapian Query was: ".$rel_enq->get_query()->get_description(), 1) if DEBUG;
     my @rel_pkg = $rel_enq->matches(2,20);
 
-    use Data::Dumper;
-    debug(Dumper(\@rel_pkg),1);
+#    use Data::Dumper;
+#    debug(Dumper(\@rel_pkg),1);
 
     my (@order, %tmp_results);
     foreach my $match ( @rel_pkg ) {

diff --git a/templates/html/filelist.tmpl b/templates/html/filelist.tmpl
index be74cc35debc93ffb4c98f97d692612f87e4502c..dbf9feaf06262a4e7cd53b7d0056df47ce3a14b2 100644 (file)
--- a/templates/html/filelist.tmpl
+++ b/templates/html/filelist.tmpl
@@ -15,3 +15,5 @@
 [% file %]
 [% '</pre></div>' IF loop.last -%]
 [% END %]
+
+[%- PROCESS 'html/foot.tmpl' -%]