Little error in #1309 + use it

8 years ago · 77874022ab
parent a2f411f811
commit 77874022ab
4 changed files with 7 additions and 8 deletions
--- a/1
+++ b/1
@ -506,7 +506,6 @@ plackup:
 			-I`pwd`/lemonldap-ng-portal/blib/lib/ \
 			-I`pwd`/lemonldap-ng-manager/blib/lib/ \
 		e2e-tests/conf/sbin/llng-fastcgi-server \
-			-f e2e-tests/custom.pm \
 			-F >e2e-tests/conf/fastcgi.log 2>&1 &

 install_test:
--- a/e2e-tests/env.conf
+++ b/e2e-tests/env.conf
@ -7,5 +7,4 @@ SetEnv LLNG_DEFAULTCONFFILE __pwd__/e2e-tests/conf/lemonldap-ng.ini
        use lib "__pwd__/lemonldap-ng-handler/blib/lib";
        use lib "__pwd__/lemonldap-ng-portal/blib/lib";
        use lib "__pwd__/lemonldap-ng-manager/blib/lib";
-	require "__pwd__/e2e-tests/custom.pm";
 </perl>
--- a/e2e-tests/lemonldap-ng.ini
+++ b/e2e-tests/lemonldap-ng.ini
@ -1,6 +1,7 @@
 [all]

 logLevel = debug
+require  = __pwd__/e2e-tests/custom.pm

 [configuration]

--- a/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
+++ b/lemonldap-ng-handler/lib/Lemonldap/NG/Handler/Main/Jail.pm
@ -32,16 +32,16 @@ sub build_jail {

    $self->useSafeJail(1) unless defined $self->useSafeJail;

-    if($require) {
-        foreach my $f (split /[, ]+/, $require) {
-            if($f =~ /^[\w\:]+$/) {
+    if ($require) {
+        foreach my $f ( split /[, ]+/, $require ) {
+            if ( $f =~ /^[\w\:]+$/ ) {
                eval "require $f";
            }
            else {
-                eval "require '$f'";
+                eval { require $f; };
            }
-            if($@) {
-                die "Unable to load required files: $@";
+            if ($@) {
+                die "Unable to load '$f': $@";
            }
        }
    }