fix package/packages typo

[debbugs.git] / cgi / version.cgi

diff --git a/cgi/version.cgi b/cgi/version.cgi
index e3df1fc1cd2decd453e54c67681a91d07f6b61f2..b7d99b96396ee68f0d51625bbe42bf37d7d35b77 100755 (executable)
--- 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;
 
@@ -232,7 +254,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 +303,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');