[309] in BarnOwl Developers
[D-O-H] r455 - / trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:04:46 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Fri, 10 Nov 2006 12:38:52 -0500 (EST)
Author: nelhage
Date: 2006-11-10 12:38:52 -0500 (Fri, 10 Nov 2006)
New Revision: 455
Modified:
/
trunk/owl/perlwrap.pm
Log:
r23946@heretique: nelhage | 2006-11-10 12:37:12 -0500
Handling errors loading perl modules
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:23945
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:23946
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2006-11-10 17:38:50 UTC (rev 454)
+++ trunk/owl/perlwrap.pm 2006-11-10 17:38:52 UTC (rev 455)
@@ -414,7 +414,13 @@
@modules = grep( /\.pl$/, readdir(MODULES) );
foreach my $mod (@modules) {
- do "$dir/$mod";
+ unless (do "$dir/$mod") {
+ if($!) {
+ owl::error("Error loading $dir/$mod: $!");
+ } elsif($@) {
+ owl::error("Error loading $dir/$mod: $@");
+ }
+ }
}
closedir(MODULES);
}
