No maintainer for $showpkg. Please do not report new bugs against this package.
\n";
+ print {$output} "
There is no maintainer for $showpkg. ".
+ "This means that this package no longer exists (or never existed). ".
+ "Please do not report new bugs against this package.
\n";
}
my @pkgs = getsrcpkgs($srcforpkg);
@pkgs = grep( !/^\Q$package\E$/, @pkgs );
@@ -129,18 +128,27 @@ sub generate_package_info{
my @references;
my $pseudodesc = getpseudodesc();
if ($package and defined($pseudodesc) and exists($pseudodesc->{$package})) {
- push @references, "to the ".
+ push @references, "to the ".
"list of other pseudo-packages";
}
+ elsif (not defined $maint and not @{$param{bugs}}) {
+ # don't bother printing out this information, because it's
+ # already present above.
+ # print {$output} "
There is no record of the " . html_escape($package) .
+ # ($param{binary} ? " package" : " source package") .
+ # ", and no bugs have been filed against it.
";
+ }
else {
if ($package and defined $config{package_pages} and length $config{package_pages}) {
push @references, sprintf "to the %s package page",
- html_escape("http://$config{package_pages}/$package"), html_escape("$package");
+ html_escape("$config{package_pages}/$package"), html_escape("$package");
}
if (defined $config{subscription_domain} and
length $config{subscription_domain}) {
my $ptslink = $param{binary} ? $srcforpkg : $package;
- push @references, q(to the Package Tracking System);
+ # the pts only wants the source, and doesn't care about src: (#566089)
+ $ptslink =~ s/^src://;
+ push @references, q(to the Package Tracking System);
}
# Only output this if the source listing is non-trivial.
if ($param{binary} and $srcforpkg) {
@@ -158,14 +166,9 @@ sub generate_package_info{
if (defined $maint) {
print {$output} "
If you find a bug not listed here, please\n";
printf {$output} "report it.
\n",
- html_escape("http://$config{web_domain}/Reporting$config{html_suffix}");
- }
- if (not defined $maint and not @{$param{bugs}}) {
- print {$output} "
There is no record of the " . html_escape($package) .
- ($param{binary} ? " package" : " source package") .
- ", and no bugs have been filed against it.
";
+ html_escape("$config{web_domain}/Reporting$config{html_suffix}");
}
- return $output_scalar;
+ return decode_utf8($output_scalar);
}
@@ -222,7 +225,7 @@ sub short_bug_status_html {
if (@blockedby && $status{"pending"} ne 'fixed' && ! length($status{done})) {
for my $b (@blockedby) {
my %s = %{get_bug_status($b)};
- next if $s{"pending"} eq 'fixed' || length $s{done};
+ next if (defined $s{pending} and $s{pending} eq 'fixed') or (defined $s{done} and length $s{done});
push @{$status{blockedby_array}},{bug_num => $b, subject => $s{subject}, status => \%s};
}
}
@@ -232,7 +235,7 @@ sub short_bug_status_html {
if (@blocks && $status{"pending"} ne 'fixed' && ! length($status{done})) {
for my $b (@blocks) {
my %s = %{get_bug_status($b)};
- next if $s{"pending"} eq 'fixed' || length $s{done};
+ next if (defined $s{pending} and $s{pending} eq 'fixed') or (defined $s{done} and length $s{done});
push @{$status{blocks_array}}, {bug_num => $b, subject => $s{subject}, status => \%s};
}
}
@@ -307,8 +310,6 @@ sub pkg_htmlizebugs {
my $header = '';
my $footer = "
Summary
\n";
- my @dummy = ($gRemoveAge); #, @gSeverityList, @gSeverityDisplay); #, $gHTMLExpireNote);
-
if (@bugs == 0) {
return "
No reports found!
\n";
}
@@ -349,12 +350,14 @@ sub pkg_htmlizebugs {
push @{$exclude{$key}}, split /\s*,\s*/, $value;
}
+ my $binary_to_source_cache = {};
foreach my $bug (@bugs) {
my %status = %{get_bug_status(bug=>$bug,
(exists $param{dist}?(dist => $param{dist}):()),
bugusertags => $param{bugusertags},
(exists $param{version}?(version => $param{version}):()),
(exists $param{arch}?(arch => $param{arch}):(arch => $config{default_architectures})),
+ binary_to_source_cache => $binary_to_source_cache,
)};
next unless %status;
next if bug_filter(bug => $bug,
@@ -366,7 +369,6 @@ sub pkg_htmlizebugs {
);
my $html = "
"; ##%d: %s\n ",
- #bug_url($bug), $bug, html_escape($status{subject});
$html .= short_bug_status_html(status => \%status,
options => $param{options},
) . "\n";
@@ -458,112 +460,59 @@ sub pkg_htmlizebugs {
return $result;
}
-sub pkg_javascript {
- return fill_in_template(template=>'cgi/pkgreport_javascript',
- );
-}
-
-sub pkg_htmlselectyesno {
- my ($name, $n, $y, $default) = @_;
- return sprintf('', $name, ($default ? "" : " selected"), $n, ($default ? " selected" : ""), $y);
-}
-
-sub pkg_htmlselectsuite {
- my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2];
- my @suites = ("stable", "testing", "unstable", "experimental");
- my %suiteaka = ("stable", "etch", "testing", "lenny", "unstable", "sid");
- my $defaultsuite = "unstable";
-
- my $result = sprintf '';
- return $result;
-}
-
-sub pkg_htmlselectarch {
- my $id = sprintf "b_%d_%d_%d", $_[0], $_[1], $_[2];
- my @arches = qw(alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc);
-
- my $result = sprintf '';
- return $result;
-}
-
-sub myurl {
- my %param = @_;
- return html_escape(pkg_url(map {exists $param{$_}?($_,$param{$_}):()}
- qw(archive repeatmerged mindays maxdays),
- qw(version dist arch package src tag maint submitter)
- )
- );
-}
-
-sub make_order_list {
- my $vfull = shift;
- my @x = ();
-
- if ($vfull =~ m/^([^:]+):(.*)$/) {
- my $v = $1;
- for my $vv (split /,/, $2) {
- push @x, "$v=$vv";
- }
- }
- else {
- for my $v (split /,/, $vfull) {
- next unless $v =~ m/.=./;
- push @x, $v;
- }
- }
- push @x, ""; # catch all
- return @x;
+sub parse_order_statement_into_boolean {
+ my ($statement,$status,$tags) = @_;
+
+ if (not defined $tags) {
+ $tags = {map { $_, 1 } split / /, $status->{"tags"}
+ }
+ if defined $status->{"tags"};
+
+ }
+ # replace all + with &&
+ $statement =~ s/\+/&&/g;
+ # replace all , with ||
+ $statement =~ s/,/||/g;
+ $statement =~ s{([^\&\|\=]+) # field
+ =
+ ([^\&\|\=]+) # value
+ }{
+ my $ok = 0;
+ if ($1 eq 'tag') {
+ $ok = 1 if defined $tags->{$2};
+ } else {
+ $ok = 1 if defined $status->{$1} and
+ $status->{$1} eq $2;
+ }
+ $ok;
+ }exg;
+ # check that the parsed statement is just valid boolean statements
+ if ($statement =~ /^([01\(\)\&\|]+)$/) {
+ return eval "$1";
+ } else {
+ # this is an invalid boolean statement
+ return 0;
+ }
}
sub get_bug_order_index {
my $order = shift;
my $status = shift;
- my $pos = -1;
-
- my %tags = ();
- %tags = map { $_, 1 } split / /, $status->{"tags"}
- if defined $status->{"tags"};
-
+ my $pos = 0;
+ my $tags = {map { $_, 1 } split / /, $status->{"tags"}
+ }
+ if defined $status->{"tags"};
for my $el (@${order}) {
- $pos++;
- my $match = 1;
- for my $item (split /[+]/, $el) {
- my ($f, $v) = split /=/, $item, 2;
- next unless (defined $f and defined $v);
- my $isokay = 0;
- $isokay = 1 if (defined $status->{$f} and $v eq $status->{$f});
- $isokay = 1 if ($f eq "tag" && defined $tags{$v});
- unless ($isokay) {
- $match = 0;
- last;
- }
- }
- if ($match) {
- return $pos;
- last;
- }
+ if (not length $el or
+ parse_order_statement_into_boolean($el,$status,$tags)
+ ) {
+ return $pos;
+ }
+ $pos++;
}
- return $pos + 1;
-}
-
-sub buglinklist {
- my ($prefix, $infix, @els) = @_;
- return '' if not @els;
- return $prefix . bug_linklist($infix,'submitter',@els);
+ return $pos;
}
-
# sets: my @names; my @prior; my @title; my @order;
sub determine_ordering {