Forward port PayDriver button and labeling fix.
Forward port testEnvironment fix for not having prerequisite perl modules.
This commit is contained in:
parent
08bf6b5147
commit
6336e569ff
5 changed files with 12 additions and 5 deletions
|
|
@ -54,6 +54,8 @@ if ($] >= 5.008) {
|
|||
failAndExit("Please upgrade to 5.8 or later! Cannot continue without Perl 5.8 or higher.");
|
||||
}
|
||||
|
||||
##Doing this as a global is not nice, but it works
|
||||
my $missingModule = 0;
|
||||
|
||||
checkModule("LWP", 5.80 );
|
||||
checkModule("HTTP::Request", 1.40 );
|
||||
|
|
@ -117,6 +119,7 @@ checkModule("File::Path", "2.04" );
|
|||
checkModule("Module::Find", "0.06" );
|
||||
checkModule("Class::C3", "0.19" );
|
||||
|
||||
failAndExit("Required modules are missing, running no more checks.") if $missingModule;
|
||||
|
||||
###################################
|
||||
# Checking WebGUI
|
||||
|
|
@ -267,6 +270,7 @@ sub checkModule {
|
|||
# skip
|
||||
elsif ($simpleReport) {
|
||||
printResult("Not Installed");
|
||||
$missingModule = 1;
|
||||
}
|
||||
|
||||
# if we're root lets try and install it
|
||||
|
|
@ -282,12 +286,14 @@ sub checkModule {
|
|||
# install aborted by user
|
||||
else {
|
||||
printResult("Install aborted by user input.");
|
||||
$missingModule = 1;
|
||||
}
|
||||
}
|
||||
|
||||
# can't install, not root
|
||||
else {
|
||||
printResult("Not installed, but you're not root, so you need to ask your administrator to install it.");
|
||||
$missingModule = 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue