diff options
| author | wurblzap%gmail.com <> | 2008-04-13 05:24:17 +0200 |
|---|---|---|
| committer | wurblzap%gmail.com <> | 2008-04-13 05:24:17 +0200 |
| commit | 32405051a2b162fe50b46e01a21b9aa838f20aa8 (patch) | |
| tree | d5931bc77309dbae605e6f2e7db2cd20c90bed64 | |
| parent | bf99679012539d8c458ca742321c9325300212f8 (diff) | |
| download | bugzilla-32405051a2b162fe50b46e01a21b9aa838f20aa8.tar.gz bugzilla-32405051a2b162fe50b46e01a21b9aa838f20aa8.tar.xz | |
Bug 428637 â Documentation doesn't build (and even less on Perl 5.10).
Patch by Marc Schumann <wurblzap@gmail.com>;
r=mkanat,LpSolit; a=mkanat
| -rw-r--r-- | docs/en/xml/installation.xml | 6 | ||||
| -rw-r--r-- | docs/makedocs.pl | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index e19fcf7b5..2f45eb11c 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1,5 +1,5 @@ <!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> --> -<!-- $Id: installation.xml,v 1.155 2008/04/04 06:48:25 lpsolit%gmail.com Exp $ --> +<!-- $Id: installation.xml,v 1.156 2008/04/12 22:24:23 wurblzap%gmail.com Exp $ --> <chapter id="installing-bugzilla"> <title>Installing Bugzilla</title> @@ -285,7 +285,7 @@ <listitem> <para> - CGI &min-cgi-ver; or CGI &min-mp-cgi-ver; if using mod_perl + CGI &min-cgi-ver; </para> </listitem> @@ -469,7 +469,7 @@ <listitem> <para> CGI - (&min-cgi-ver;) for mod_perl + (&min-mp-cgi-ver;) for mod_perl </para> </listitem> diff --git a/docs/makedocs.pl b/docs/makedocs.pl index ae5ba4057..17e6c3331 100644 --- a/docs/makedocs.pl +++ b/docs/makedocs.pl @@ -73,9 +73,11 @@ foreach my $module (@$modules, @$opt_modules) print ENTITIES '<!ENTITY min-' . $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); +# CGI is a special case, because for Perl versions below 5.10, it has an +# optional version *and* a required version. +# We check @opt_modules first, then @modules, and pick the first we get. +# We'll get the optional one then, if it is given, otherwise the required one. +my ($cgi_opt) = grep($_->{module} eq 'CGI', @$opt_modules, @$modules); print ENTITIES '<!ENTITY min-mp-cgi-ver "' . $cgi_opt->{version} . '">' . "\n"; print ENTITIES "\n <!-- Database Versions --> \n"; @@ -83,7 +85,8 @@ print ENTITIES "\n <!-- Database Versions --> \n"; my $db_modules = DB_MODULE; foreach my $db (keys %$db_modules) { my $dbd = $db_modules->{$db}->{dbd}; - my $name = $dbd->{package}; + my $name = $dbd->{module}; + $name =~ s/::/-/g; $name = lc($name); my $version = $dbd->{version} || 'any'; my $db_version = $db_modules->{$db}->{'db_version'}; |