Changeset 5f8d8a1

Timestamp:

Sep 15, 2008, 9:04:49 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

c194705

Parents:

d8c456c

Message:

Fix :reload-module's interactions with PAR modules.

File:

• perl/lib/BarnOwl/ModuleLoader.pm (modified) (3 diffs)

perl/lib/BarnOwl/ModuleLoader.pm

@@ -13 +13 @@
     my $class = shift;
     $class->rescan_modules;
+    PAR::reload_libs();
 
     for my $mod (keys %modules) {
@@ -24 +25 @@
 
 sub rescan_modules {
-    PAR::reload_libs();
     PAR->import(BarnOwl::get_data_dir() . "/modules/*.par");
     PAR->import(BarnOwl::get_config_dir() . "/modules/*.par");
@@ -65 +65 @@
     }
 
+    my $parfile;
+    for my $p (@PAR::PAR_INC) {
+        if($p =~ m/\Q$module\E[.]par$/) {
+            $parfile = $p;
+            last;
+        }
+    }
+
     local $SIG{__WARN__} = \&squelch_redefine;
-    if(!defined eval "use BarnOwl::Module::$module") {
+
+    if(defined $parfile) {
+        PAR::reload_libs($parfile);
+    } elsif(!defined eval "use BarnOwl::Module::$module") {
         BarnOwl::error("Unable to load module $module: \n$@\n") if $@;
     }