replacing stringy eval with load should keep load in eval

quattor · Jan 12, 2017 · a63c624 · a63c624
1 parent 0519729
commit a63c624
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/main/perl/CacheManager/DB.pm b/src/main/perl/CacheManager/DB.pm
@@ -54,8 +54,10 @@ BEGIN {
     my @to_try = sort keys %FORMAT_DISPATCH;
     foreach my $db (@to_try) {
         local $@;
-        load $db;
-        $db->import;
+        eval {
+            load $db;
+            $db->import;
+        };
         push(@db_backends, $db) unless $@;
     }
     if (!scalar @db_backends) {

diff --git a/src/main/perl/Fetch/ProfileCache.pm b/src/main/perl/Fetch/ProfileCache.pm
@@ -329,7 +329,9 @@ sub process_profile
 
     my ($class, $t) = $self->choose_interpreter($profile);
     local $@;
-    load $class;
+    eval {
+        load $class;
+    };
     die "Couldn't load interpreter $class: $@" if $@;
 
     $t = $class->interpret_node(@$t);