[325] in BarnOwl Developers
[D-O-H] r470 - / trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:04:56 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Sun, 24 Dec 2006 11:24:48 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2006-12-24 11:24:47 -0500 (Sun, 24 Dec 2006)
New Revision: 470
Modified:
/
trunk/owl/perlwrap.pm
Log:
r15860@phanatique: nelhage | 2006-12-24 11:06:47 -0500
Better error reporting when loading modules
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15859
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15860
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2006-12-24 16:21:21 UTC (rev 469)
+++ trunk/owl/perlwrap.pm 2006-12-24 16:24:47 UTC (rev 470)
@@ -10,7 +10,7 @@
BEGIN {
# bootstrap in C bindings and glue
-bootstrap owl 1.2;
+ bootstrap owl 1.2;
};
use lib(get_data_dir()."/owl/lib");
@@ -378,19 +378,19 @@
owl::mainloop_hook();
$reload = 0;
@onMainLoop = ();
- @onStartSubs = ();
+ @onStartSubs = ();
# Do reload
package main;
if (do "$ENV{HOME}/.owlconf" && owl::reload_hook(@_))
{
- return "owlconf reloaded";
+ return "owlconf reloaded";
}
else
{
return "$ENV{HOME}/.owlconf load attempted, but error encountered:\n$@";
}
-package owl;
+ package owl;
}
sub reload_init ()
@@ -405,8 +405,9 @@
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 );
@@ -414,17 +415,13 @@
@modules = grep( /\.pl$/, readdir(MODULES) );
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);
}
-
}
