From: Tyler Riddle Date: Thu, 18 Oct 2012 16:42:27 +0000 (-0700) Subject: testing non-core filter heuristic and XS loader fall-back exclusion X-Git-Tag: v0.003001_01~125 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=61c6bba76865f7126c3028655f966cb7f32fa52d;p=scpubgit%2FObject-Remote.git testing non-core filter heuristic and XS loader fall-back exclusion --- diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm index f95705d..a1e7691 100644 --- a/lib/Object/Remote/FatNode.pm +++ b/lib/Object/Remote/FatNode.pm @@ -40,13 +40,11 @@ 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 = keys %mods; +my @non_core = grep +( + not ( + /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/ + ) +), keys %mods; #my @core_non_arch = grep +( # /^\Q$Config{privlibexp}/ @@ -64,8 +62,8 @@ 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"; + if ($_[1] eq 'XSLoader.pm' || $_[1] eq 'DynaLoader.pm') { + warn "Will not pre-load '$_[1]'"; return undef; }