incorporate fatnode shipping module changes so behavior matches master branch

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index bddebb8..e5a2cac 100644 (file)
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -4,6 +4,8 @@ use strictures 1;
 use Config;
 use B qw(perlstring);
 
+my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+
 #used by t/watchdog_fatnode 
 our $INHIBIT_RUN_NODE = 0; 
 
@@ -41,17 +43,23 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
+my %exclude = map { $_ => 1 } @exclude_mods; 
 my %mods = reverse @inc;
 
-my @non_core = grep +(
+foreach(keys(%mods)) {
+  if ($exclude{ $mods{$_} }) {
+    delete($mods{$_});    
+  }
+}
+
+sub filter_not_core {
   not (
     /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )
-), keys %mods;
+  )        
+}
 
-my @core_non_arch = grep +(
-  /^\Q$Config{privlibexp}/
-), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+my @before_inc = grep { filter_not_core() } keys %mods;
+my @after_inc;
 
 my $env_pass = '';
 if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
@@ -67,17 +75,27 @@ my $start = stripspace <<'END_START';
   BEGIN {
   my (%fatpacked,%fatpacked_extra);
 END_START
+
+$start .= 'my %exclude = map { $_ => 1 } qw(' . join(' ', @exclude_mods) . ");\n";
+
 my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
 
-  sub load_from_hash {
+sub load_from_hash {
     if (my $fat = $_[0]->{$_[1]}) {
+      if ($exclude{$_[1]}) {
+        warn "Will not pre-load '$_[1]'";
+        return undef; 
+      }
+ 
+      #warn "handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
+    
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
-    return
+    return;
   }
 
   unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
@@ -95,7 +113,7 @@ my $end = stripspace <<'END_END';
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @non_core, @core_non_arch;
+              @before_inc, @after_inc;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -107,8 +125,8 @@ sub generate_fatpack_hash {
 }
 
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
+  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
 );
 
 our $DATA = join "\n", $start, $env_pass, @segments, $end;