[399] in BarnOwl Developers
[D-O-H] r536 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:43 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Thu, 18 Jan 2007 17:57:34 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-01-18 17:57:34 -0500 (Thu, 18 Jan 2007)
New Revision: 536
Modified:
trunk/
trunk/owl/perlwrap.pm
Log:
r18105@phanatique: nelhage | 2007-01-18 17:57:29 -0500
Modify :reload to be aware of the -c option, and to work if there is no .owlconf
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18103
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18105
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2007-01-18 22:35:38 UTC (rev 535)
+++ trunk/owl/perlwrap.pm 2007-01-18 22:57:34 UTC (rev 536)
@@ -322,14 +322,12 @@
# Do reload
package main;
- if (do "$ENV{HOME}/.owlconf" && BarnOwl::reload_hook(@_))
- {
- return "owlconf reloaded";
- }
- else
- {
- return "$ENV{HOME}/.owlconf load attempted, but error encountered:\n$@";
+ if (-r $BarnOwl::configfile) {
+ undef $@;
+ do $BarnOwl::configfile;
+ owl::error("Error reloading $BarnOwl::configfile: $@") if $@;
}
+ BarnOwl::reload_hook(@_);
package owl;
}
