Make Apache2::request optional and add a dependency for PLack to testEnvironment

martink · martink · commit 476ddbd307d9 · 2012-07-13T14:38:40.000+02:00
diff --git a/sbin/testEnvironment.pl b/sbin/testEnvironment.pl
@@ -115,7 +115,8 @@ BEGIN
 checkModule("POE",                          1.005        );
 checkModule("POE::Component::IKC::Server",  0.2001       );
 checkModule("POE::Component::Client::HTTP", 0.88         );
-checkModule("Apache2::Request",             2.08         );
+# In plebgui the mod_perl modules are optional
+checkModule("Apache2::Request",             2.08, 2      );
 checkModule("URI::Escape",                  "3.29"       );
 checkModule("POSIX"                                      );
 checkModule("List::Util"                                 );
@@ -162,6 +163,8 @@ BEGIN
 checkModule('Data::ICal',                   '0.16'       );
 checkModule('common::sense',                '3.2'        );
 checkModule('Geo::Coder::Googlev3',         '0.07'       );
+# Plack is required for plebgui
+checkModule('Plack'                                      );
 
 failAndExit("Required modules are missing, running no more checks.") if $missingModule;
 
@@ -412,9 +415,9 @@ sub isIn {
 #----------------------------------------
 sub isRootRequirementMet {
     if (getOs() eq "Linuxish")	 {
-	return ($< == 0);	
+	    return ($< == 0);	
     } else {
-	return 1;
+	    return 1;
     }
 }
 
