diff options
| author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-09-19 01:24:06 +0200 |
|---|---|---|
| committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-09-19 01:24:06 +0200 |
| commit | 46317c3190e95cca62cd5d932bd6bc4b45e75d23 (patch) | |
| tree | cf8b01dfc39fb3cc8bd6c43349b97e58f5947052 /Bugzilla/DB.pm | |
| parent | 7df0160f6aaf3adcb3e6ddca0fc172c5ea89eb8c (diff) | |
| download | bugzilla-46317c3190e95cca62cd5d932bd6bc4b45e75d23.tar.gz bugzilla-46317c3190e95cca62cd5d932bd6bc4b45e75d23.tar.xz | |
Bug 586244: Make mod_headers and mod_expires optional
r=glob, a=mkanat
Diffstat (limited to 'Bugzilla/DB.pm')
| -rw-r--r-- | Bugzilla/DB.pm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index 26e147f1f..6f1d3e6de 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -202,16 +202,19 @@ EOT # And now check the version of the database server itself. my $dbh = _get_no_db_connection(); - printf("Checking for %15s %-9s ", $sql_server, "(v$sql_want)") - if $output; my $sql_vers = $dbh->bz_server_version; $dbh->disconnect; + my $version_ok = vers_cmp($sql_vers, $sql_want) > -1 ? 1 : 0; + if ($output) { + Bugzilla::Install::Requirements::_checking_for({ + package => $sql_server, wanted => $sql_want, + found => $sql_vers, ok => $version_ok }); + } + # Check what version of the database server is installed and let # the user know if the version is too old to be used with Bugzilla. - if ( vers_cmp($sql_vers,$sql_want) > -1 ) { - print "ok: found v$sql_vers\n" if $output; - } else { + if (!$version_ok) { die <<EOT; Your $sql_server v$sql_vers is too old. Bugzilla requires version |