Bug 192451: Checksetup should prioritize missing module whines

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=myk

2 files changed, 14 insertions, 22 deletions

diff --git a/docs/makedocs.pl b/docs/makedocs.pl
index ac0b0baf7..949a4e95f 100644
--- a/docs/makedocs.pl
+++ b/docs/makedocs.pl
@@ -48,7 +48,7 @@ if (eval { require Pod::Simple }) {
 };
 
 use Bugzilla::Install::Requirements 
-    qw(REQUIRED_MODULES OPTIONAL_MODULES MOD_PERL_MODULES);
+    qw(REQUIRED_MODULES OPTIONAL_MODULES);
 use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION);
 
 ###############################################################################
@@ -57,14 +57,13 @@ use Bugzilla::Constants qw(DB_MODULE BUGZILLA_VERSION);
 
 my $modules = REQUIRED_MODULES;
 my $opt_modules = OPTIONAL_MODULES;
-my $mod_perl_modules = MOD_PERL_MODULES;
 
 open(ENTITIES, '>', 'xml/bugzilla.ent') or die('Could not open xml/bugzilla.ent: ' . $!);
 print ENTITIES '<?xml version="1.0"?>' ."\n\n";
 print ENTITIES '<!-- Module Versions -->' . "\n";
 foreach my $module (@$modules, @$opt_modules)
 {
-    my $name = $module->{'name'};
+    my $name = $module->{'module'};
     $name =~ s/::/-/g;
     $name = lc($name);
     #This needs to be a string comparison, due to the modules having
@@ -73,17 +72,10 @@ foreach my $module (@$modules, @$opt_modules)
     print ENTITIES '<!ENTITY min-' . $name . '-ver "'.$version.'">' . "\n";
 }
 
-print ENTITIES "\n <!-- mod_perl Versions --> \n";
-foreach my $module (@$mod_perl_modules)
-{
-    my $name = $module->{'name'};
-    $name =~ s/::/-/g;
-    $name = lc($name);
-    #This needs to be a string comparison, due to the modules having
-    #version numbers like 0.9.4
-    my $version = $module->{'version'} eq 0 ? 'any' : $module->{'version'};
-    print ENTITIES '<!ENTITY min-mp-' . $name . '-ver "'.$version.'">' . "\n";
-}
+# CGI is a special case, because it has an optional version *and* a required
+# version.
+my ($cgi_opt) = grep($_->{package} eq 'CGI', @$opt_modules);
+print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n";
 
 print ENTITIES "\n <!-- Database Versions --> \n";
 
diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 4461140d8..598089286 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -1,5 +1,5 @@
 <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
-<!-- $Id: installation.xml,v 1.130 2006/10/08 18:41:45 mozilla%colinogilvie.co.uk Exp $ -->
+<!-- $Id: installation.xml,v 1.131 2006/10/17 05:58:41 mkanat%bugzilla.org Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
@@ -373,8 +373,8 @@
 
         <listitem>
           <para>
-            <link linkend="install-modules-gd-text-align">GD::Text::Align</link>
-            (&min-gd-text-align-ver;) for bug charting
+            <link linkend="install-modules-gd-text">GD::Text</link>
+            (&min-gd-text-ver;) for bug charting
           </para>
         </listitem>
 
@@ -477,10 +477,10 @@
         </para>
       </section>
 
-      <section id="install-modules-gd-text-align">
-        <title>GD::Text::Align (&min-gd-text-align-ver;)</title>
+      <section id="install-modules-gd-text">
+        <title>GD::Text (&min-gd-text-ver;)</title>
 
-        <para>The GD::Text::Align module is only required if you want graphical 
+        <para>The GD::Text module is only required if you want graphical 
         reports.
         </para>
       </section>
@@ -575,14 +575,14 @@
       
       <para>Bugzilla requires <literal>mod_perl</literal> to be installed, which can be
       obtained from <ulink url="http://perl.apache.org"/> - Bugzilla requires
-      version &min-mp-mod_perl2-ver; (AKA 2.0.0-RC5) to be installed.</para>
+      version &min-mod_perl2-ver; (AKA 2.0.0-RC5) to be installed.</para>
       
       <para>Bugzilla also requires a more up-to-date version of the CGI
       perl module to be installed, version &min-mp-cgi-ver; as opposed to &min-cgi-ver;
       </para>
       
       <para>Finally, Bugzilla also requires <literal>Apache::DBI</literal>
-      (&min-mp-apache-dbi-ver;) to be installed as well.</para>
+      (&min-apache-dbi-ver;) to be installed as well.</para>
     </section>
   </section>