X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cgi%2Fversion.cgi;h=b5740f2e564c978f6ba6d0b149b22573077d18bf;hb=1baf641677a804c01464aa9af8b98d1382fb5dfb;hp=ab8f3c17a287604aa8e565165c961bd5987c0889;hpb=307a891161c5c60babae0416455c1a3a34cff34b;p=debbugs.git

diff --git a/cgi/version.cgi b/cgi/version.cgi
index ab8f3c1..b5740f2 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}) {
+    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',
@@ -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}}){