X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FCGI.pm;h=0dded210ef0be99c43428de70fbf7444c217a41d;hb=f9f183095d5100a9cecc864361e19881601d780f;hp=94986cba7a3c0860982ec3fce14b3f8a8daa5d26;hpb=ab47ae363dddbc35743572c62fae6350dcb7cf96;p=deb%2Fpackages.git

diff --git a/lib/Packages/CGI.pm b/lib/Packages/CGI.pm
index 94986cb..0dded21 100644
--- a/lib/Packages/CGI.pm
+++ b/lib/Packages/CGI.pm
@@ -416,13 +416,15 @@ sub make_url {
 	$val = $override->{$p} if exists $override->{$p};
 	push @query_string, "$p=$val" if $val;
     }
-    push @path, $add_path if $add_path;
+    push @path, $add_path if $add_path and $add_path ne '/';
     push @query_string, $add_query if $add_query;
 
     my $path = join( '/', @path );
     my $query_string = join( '&', @query_string );
+    $path .= '/' if $add_path and $add_path eq '/';
+    $path .= "?$query_string" if $query_string;
 
-    return "$path?$query_string";
+    return $path;
 }
 
 sub make_search_url {
@@ -433,7 +435,7 @@ sub make_search_url {
     push @path, $Packages::Config::SEARCH_URL
 	if $Packages::Config::SEARCH_URL;
     foreach my $p (qw(lang source suite archive section subsection
-		      exact mode searchon format debug)) {
+		      arch exact mode searchon format debug)) {
 	my $val = $url_params{$p};
 	$val = $query_params{$p} if exists $query_params{$p};
 	$val = $override->{$p} if exists $override->{$p};