Changeset 23be736

Timestamp:

Dec 24, 2006, 11:24:47 AM (18 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, barnowl_perlaim, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

f62550d

Parents:

17eed9c

git-author:

Nelson Elhage <nelhage@mit.edu> (12/24/06 11:06:47)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/24/06 11:24:47)

Message:

Better error reporting when loading modules

File:

• perlwrap.pm (modified) (6 diffs)

perlwrap.pm

@@ -11 +11 @@
 BEGIN {
 # bootstrap in C bindings and glue
-bootstrap owl 1.2;
+    bootstrap owl 1.2;
 };
 
@@ -379 +379 @@
     $reload = 0;
     @onMainLoop = ();
-  @onStartSubs = ();
+    @onStartSubs = ();
     
     # Do reload
@@ -385 +385 @@
     if (do "$ENV{HOME}/.owlconf" && owl::reload_hook(@_))
     {
-        return "owlconf reloaded";
+        return "owlconf reloaded";
     } 
     else
@@ -391 +391 @@
         return "$ENV{HOME}/.owlconf load attempted, but error encountered:\n$@";
     }
-package owl;
+    package owl;
 }
 
@@ -406 +406 @@
 sub loadModules () {
     my @modules;
+    my $rv;
     foreach my $dir ( owl::get_data_dir() . "/owl/modules",
-        $ENV{HOME} . "/.owl/modules" )
+                      $ENV{HOME} . "/.owl/modules" )
     {
         opendir( MODULES, $dir );
@@ -415 +416 @@
 
         foreach my $mod (@modules) {
-                unless (do "$dir/$mod") {
-                        if($!) {
-                                owl::error("Error loading $dir/$mod: $!");
-                        } elsif($@) {
-                                owl::error("Error loading $dir/$mod: $@");
-                        }
-                }
+            unless ($rv = do "$dir/$mod") {
+                owl::error("Couldn't load $dir/$mod:\n $@") if $@;
+                owl::error("Couldn't run $dir/$mod:\n $!") unless defined $rv;
+            }
         }
         closedir(MODULES);
     }
-
 }