From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Thu, 18 Oct 2012 02:57:30 +0000 (-0700)
Subject: reject XSLoader at fatnode module loader if it made it through
X-Git-Tag: v0.003001_01~126
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1900601d36909443e9b9dff3288d1041d72e834f;p=scpubgit%2FObject-Remote.git

reject XSLoader at fatnode module loader if it made it through
---

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 23c8296..f95705d 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -40,11 +40,13 @@ chomp(my @inc = qx($command));
 
 my %mods = reverse @inc;
 
-my @non_core = grep +(
-  not (
-    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )
-), keys %mods;
+#my @non_core = grep +(
+#  not (
+#    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
+#  )
+#), keys %mods;
+
+my @non_core = keys %mods; 
 
 #my @core_non_arch = grep +(
 #  /^\Q$Config{privlibexp}/
@@ -62,10 +64,16 @@ my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
 
   sub load_from_hash {
+    if ($_[1] eq 'XSLoader.pm') {
+      warn "XSLoader made it into the fat node";
+      return undef; 
+    }
+
     if (my $fat = $_[0]->{$_[1]}) {
       open my $fh, '<', \$fat;
       return $fh;
     }
+    
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
     return