From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 17 Feb 2012 18:55:53 +0000 (-0500)
Subject: argh, had broken backing up of hierarchies by patttern after extending that notion
X-Git-Tag: 2.140.90~1596^2~3
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ed8e936a8e6468156e790bc4c47f869f444be7e8;p=feisty_meow.git

argh, had broken backing up of hierarchies by patttern after extending that notion
to allow a sub-component for the directory name.
---

diff --git a/scripts/archival/shared_snarfer.pl b/scripts/archival/shared_snarfer.pl
index 998cc5f7..e0c7acb2 100644
--- a/scripts/archival/shared_snarfer.pl
+++ b/scripts/archival/shared_snarfer.pl
@@ -329,7 +329,7 @@ sub backup_hierarchies {
 # used as an extra directory component after the main directory.
 sub snarf_by_pattern {
   local($prefix, $dir, $pattern, $extra_component) = @_;
-#  print "dir = $dir and patt = $pattern\n";
+  print "dir = $dir and patt = $pattern\n";
   $extra_piece = "";
   $dir_for_hierarchy = ".";
   if (length($extra_component)) {
@@ -337,17 +337,19 @@ sub snarf_by_pattern {
     $dir_for_hierarchy = $extra_component;
   }
 
-  @dir_contents = &glob_list("$dir$extra_piece/*$pattern*"); 
-#  print "dir contents: @dir_contents\n";
+  @dir_contents = &glob_list("$dir_for_hierarchy$extra_piece/*$pattern*"); 
+  print "dir contents: @dir_contents\n";
 
   if (!scalar(@dir_contents)) {
     print "no '$pattern' directores were backed up in $dir.\n";
   }
   
   foreach $item (@dir_contents) {
+print "considering backup hier of $item\n";
     if ( ($item =~ /$pattern.*snarf/) || ($item =~ /$pattern.*tar/) ) { next; }
     if ( ! -d "$item" ) { next; }
-    &backup_hierarchy($prefix, $number, $dir, "$dir_for_hierarchy" . "/" . &basename($item));
+print "now really planning to backup hier of $item\n";
+    &backup_hierarchy($prefix, $number, $dir_for_hierarchy . $extra_piece, &basename($item));
   }
 }