X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fversion.cgi;h=64e53147b94da51e37655397777c9c736adadff1;hb=cd0b9752cb6b5cec796baf1c07951cee5971b42e;hp=046fec660fac33ed1d359b3f481a1fd1cd2156ff;hpb=439cc3070c8396865639bacbf98704cae68a24bd;p=debbugs.git
diff --git a/cgi/version.cgi b/cgi/version.cgi
index 046fec6..64e5314 100755
--- a/cgi/version.cgi
+++ b/cgi/version.cgi
@@ -11,6 +11,28 @@ BEGIN{
}
}
+# if we're running out of git, we want to use the git base directory as the
+# first INC directory. If you're not running out of git, don't do that.
+use File::Basename qw(dirname);
+use Cwd qw(abs_path);
+our $debbugs_dir;
+BEGIN {
+ $debbugs_dir =
+ abs_path(dirname(abs_path(__FILE__)) . '/../');
+ # clear the taint; we'll assume that the absolute path to __FILE__ is the
+ # right path if there's a .git directory there
+ ($debbugs_dir) = $debbugs_dir =~ /([[:print:]]+)/;
+ if (defined $debbugs_dir and
+ -d $debbugs_dir . '/.git/') {
+ } else {
+ undef $debbugs_dir;
+ }
+ # if the first directory in @INC is not an absolute directory, assume that
+ # someone has overridden us via -I.
+ if ($INC[0] !~ /^\//) {
+ }
+}
+use if defined $debbugs_dir, lib => $debbugs_dir;
use CGI::Simple;
@@ -20,7 +42,7 @@ 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;
@@ -30,6 +52,12 @@ use File::Temp qw(tempdir);
use IO::File;
use IO::Handle;
+my @schema_arg = ();
+if (defined $config{database}) {
+ $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',
@@ -102,7 +130,7 @@ END
print '['.($cgi_var{collapse}?"Don't c":'C').'ollapse] ';
print '[Dot]
';
+ '">[Dot]
';
print '';
print <
@@ -119,6 +147,7 @@ for my $dist (@{$config{distributions}}) {
$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}}){
@@ -232,7 +261,6 @@ if ($cgi_var{collapse}) {
# nodes that can be collapsed are those that have one child
# are in the same state as their parent, and are not in a suite
foreach my $key (keys %reversed_nodes) {
- my ($short_version) = $key =~ m{/(.+)$};
if (not exists $version_to_dist{$key}
and @{$reversed_nodes{$key}} <= 1
and defined $version->{parent}{$key}
@@ -282,7 +310,6 @@ if ($cgi_var{collapse}) {
}
foreach my $key (keys %all_states) {
- my ($short_version) = $key =~ m{/(.+)$};
next if exists $collapsed_nodes{$key};
next if $cgi_var{ignore_boring} and (not defined $all_states{$key}
or $all_states{$key} eq 'absent');