oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 6.7.8 changes and bug fixes

Browse source
This commit is contained in:
JT Smith 2005-11-30 20:33:40 +00:00
parent 4bd429bcac
commit fdfb9bf5ae
8 changed files with 95 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sbin/testEnvironment.pl
View file

@ -159,7 +159,9 @@ sub checkModule {
unless (defined $afterinstall) { $afterinstall = 0; }
printTest("Checking for module $module");
my $statement = "require ".$module.";";
if (eval($statement)) {
if ($afterinstall == 1) {
failAndExit("Install of $module failed!");
} elsif (eval($statement)) {
$statement = '$'.$module."::VERSION";
my $currentVersion = eval($statement);
if ($currentVersion >= $version) {
@ -179,8 +181,6 @@ sub checkModule {
failAndExit("Aborting test, not all modules available, and you're not root so I can't install them.");
}
}
} elsif ($afterinstall == 1) {
failAndExit("Install of $module failed!");
} else {
printResult("Not Installed");
return if $skipInstall;