[498] in BarnOwl Developers
[D-O-H] r620 - in trunk: . owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:06:49 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
Date: Sat, 17 Feb 2007 16:37:01 -0500
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-To: dirty-owl-hackers@MIT.EDU
Author: nelhage
Date: 2007-02-17 16:37:01 -0500 (Sat, 17 Feb 2007)
New Revision: 620
Modified:
trunk/
trunk/owl/perlwrap.pm
Log:
r18964@phanatique: nelhage | 2007-02-17 16:36:49 -0500
Prefer ~/.barnowlconf, if it exists.
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:18961
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:18964
Modified: trunk/owl/perlwrap.pm
===================================================================
--- trunk/owl/perlwrap.pm 2007-02-17 21:35:55 UTC (rev 619)
+++ trunk/owl/perlwrap.pm 2007-02-17 21:37:01 UTC (rev 620)
@@ -23,11 +23,14 @@
};
use lib(get_data_dir()."/lib");
-use lib($::ENV{'HOME'}."/.owl/lib");
+use lib($ENV{HOME}."/.owl/lib");
our $configfile;
-$configfile ||= $::ENV{'HOME'}."/.owlconf";
+if(!$configfile && -f $ENV{HOME} . "/.barnowlconf") {
+ $configfile = $ENV{HOME} . "/.barnowlconf";
+}
+$configfile ||= $ENV{HOME}."/.owlconf";
# populate global variable space for legacy owlconf files
sub _format_msg_legacy_wrap {
