if ($INC[0] !~ /^\//) {
}
}
-use if defined $debbugs_dir, lib => $debbugs_dir;
+use if defined $debbugs_dir, lib => $debbugs_dir.'/lib/';
use CGI::Simple;
use Debbugs::Config qw(:config);
our $VERSION=1;
-
+use Debbugs::DB;
use Debbugs::CGI qw(htmlize_packagelinks html_escape cgi_parameters munge_url :cache);
use Debbugs::Versions;
use Debbugs::Versions::Dpkg;
-use Debbugs::Packages qw(get_versions makesourceversions);
+use Debbugs::Packages qw(get_versions make_source_versions);
use HTML::Entities qw(encode_entities);
use File::Temp qw(tempdir);
use IO::File;
use IO::Handle;
+my @schema_arg = ();
+if (defined $config{database}) {
+ my $s = Debbugs::DB->connect($config{database}) or
+ die "Unable to connect to DB";
+ @schema_arg = ('schema',$s);
+}
my %img_types = (svg => 'image/svg+xml',
png => 'image/png',
fixed => [],
ignore_boring => 1,
collapse => 0,
- format => 'png',
+ format => 'svg',
width => undef,
height => undef,
info => 0,
$versions{$dist} = [get_versions(package => [split /\s*,\s*/, $cgi_var{package}],
dist => $dist,
source => 1,
+ @schema_arg,
)];
# make version_to_dist
foreach my $version (@{$versions{$dist}}){
# then figure out which are affected.
# turn found and fixed into full versions
-@{$cgi_var{found}} = map {makesourceversions($_,undef,@{$cgi_var{found}})} split/\s*,\s*/, $cgi_var{package};
-@{$cgi_var{fixed}} = map {makesourceversions($_,undef,@{$cgi_var{fixed}})} split/\s*,\s*/, $cgi_var{package};
-my @interesting_versions = map {makesourceversions($_,undef,keys %version_to_dist)} split/\s*,\s*/, $cgi_var{package};
+@{$cgi_var{found}} =
+ map {make_source_versions(package => $_,
+ versions => $cgi_var{found})}
+ split/\s*,\s*/, $cgi_var{package};
+@{$cgi_var{fixed}} =
+ map {make_source_versions(package =>$_,
+ versions => $cgi_var{fixed})}
+ split/\s*,\s*/, $cgi_var{package};
+my @interesting_versions =
+ map {make_source_versions(package => $_,
+ versions => [keys %version_to_dist])}
+ split/\s*,\s*/, $cgi_var{package};
# We need to be able to rip out leaves which the versions that do not affect the current versions of unstable/testing
my %sources;
# at this point, we know enough to calculate the etag.
my @versions_files;
-foreach my $source (keys %sources) {
+foreach my $source (sort keys %sources) {
my $srchash = substr $source, 0, 1;
next unless -e "$config{version_packages_dir}/$srchash/$source";
push @versions_files, "$config{version_packages_dir}/$srchash/$source";