From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Wed, 5 Dec 2012 19:32:56 +0000 (-0800)
Subject: update comment about empty config vars and regexs in fatnode module shipping filters
X-Git-Tag: v0.003001_01~47
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=15b847bbaf9afc1e8370481a29be9164399fde51;p=scpubgit%2FObject-Remote.git

update comment about empty config vars and regexs in fatnode module shipping filters
---

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 734929b..0d4ee05 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -51,15 +51,25 @@ foreach(keys(%mods)) {
   }
 }
 
-sub filter_not_core {
+my @non_core_non_arch = ( $mods{'Devel/GlobalDestruction.pm'} );
+push @non_core_non_arch, grep +(
   not (
-    /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )        
-}
-
-my @file_names = keys %mods;
-my @before_inc = grep { filter_not_core() } @file_names;
-my @after_inc;
+    #some of the config variables can be empty which will eval as a matching regex
+    $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/ 
+      or $Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+      or $Config{vendorarchexp} ne '' && /^\Q$Config{vendorarchexp}/
+      or $Config{sitearchexp} ne '' && /^\Q$Config{sitearchexp}/
+  )
+), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+
+my @core_non_arch = grep +(
+  $Config{privlibexp} ne '' && /^\Q$Config{privlibexp}/
+  and not($Config{archlibexp} ne '' && /^\Q$Config{archlibexp}/
+    or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
+), keys %mods;
+
+#print STDERR "non-core non-arch ", Dumper(\@non_core_non_arch);
+#print STDERR "core non-arch ", Dumper(\@core_non_arch);
 
 #TODO this is the wrong path to go down - fork() will bring
 #the env vars with it and the ssh connector can handle
@@ -133,7 +143,7 @@ my $end = stripspace <<'END_END';
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @before_inc, @after_inc;
+              @non_core_non_arch, @core_non_arch;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -148,8 +158,8 @@ sub generate_fatpack_hash {
 }
 
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
+  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
 );
 
 our $DATA = join "\n", $start, $env_pass, @segments, $end;