From: Jeroen van Wolffelaar <jeroen@wolffelaar.nl>
Date: Thu, 23 Feb 2006 15:30:12 +0000 (+0000)
Subject: Fix two warnings
X-Git-Tag: switch-to-templates~48
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=c6b61e4d05ebeccd211fbd2bbf333ffddab3b649;p=deb%2Fpackages.git

Fix two warnings
---

diff --git a/lib/Packages/HTML.pm b/lib/Packages/HTML.pm
index c8cd39d..0fc506a 100644
--- a/lib/Packages/HTML.pm
+++ b/lib/Packages/HTML.pm
@@ -258,7 +258,6 @@ sub print_deps {
     my $res = "<ul class=\"ul$dep_type{$type}\">\n";
     my $first = 1;
     my $suite = $opts->{suite}[0];
-    my $one_archive = @{$opts->{archive}} > 1 ? '': $opts->{archive}[0];
 
 #    use Data::Dumper;
 #    debug( "print_deps called:\n".Dumper( $pkg, $relations, \$type ), 3 ) if DEBUG;
@@ -301,8 +300,7 @@ sub print_deps {
 	    my $arch = $entry->[3];
 	    my $archive = $entry->[1];
 	    if ( $short_desc ) {
-		my $path = $one_archive eq $archive ? "$suite/$archive" :
-		    $suite;
+		my $path = $suite;
 		if ( $is_old_pkgs ) {
 		    push @res_pkgs, dep_item( "$ROOT/$path/$p_name",
 					      $p_name, "$pkg_version$arch_str" );
diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index b793ab4..d8d559a 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -380,6 +380,7 @@ sub read_entry_simple {
     my %virt = split /\01/o, $virt; 
     debug( "read_entry_simple: key=$key, archives=".
 	   join(" ",(keys %$archives)).", suite=$suite", 1) if DEBUG;
+    return [ $virt{$suite} ] unless defined $result;
     foreach (split /\000/o, $result) {
 	my @data = split ( /\s/o, $_, 8 );
 	debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;