mason/dhandler: Trap errors from module imports.

[tgal] / mason / dhandler

diff --git a/mason/dhandler b/mason/dhandler
index 8c151bac19ac249c4b629fc2283febd1b9ae0d4c..610a5440caa942789e5b99706afe464b5e7803ae 100755 (executable)
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -434,13 +434,19 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 %###-------------------------------------------------------------------------
 <%once>
 %
 %###-------------------------------------------------------------------------
 <%once>

-       use autodie;
-       use File::stat;
+       BEGIN {
+         eval {
+           require autodie; autodie->import;
+           require File::stat; File::stat->import;

 
 

-       use TrivGal;
+           require TrivGal; TrivGal->import;
+         };
+         if ($@) { print "$@"; exit 2; }
+       }

 </%once>
 %
 <%init>
 </%once>
 %
 <%init>

+       clean_temp_files;

        TrivGal->init;
 
        my $path = $m->dhandler_arg;
        TrivGal->init;
 
        my $path = $m->dhandler_arg;