From 5ed4ecff45b97c219c918fb3ee0d88c98ae2e19e Mon Sep 17 00:00:00 2001
From: jeff <jeff>
Date: Sun, 7 Mar 2010 18:07:20 +0000
Subject: [PATCH] pass format and correct filenames

---
 FS/FS/tax_rate.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 9b79b61bb..45f3f5814 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -959,9 +959,9 @@ sub _perform_batch_import {
           unless $keep_cch_files;
         push @insert_list, $name, $insertname, $import_sub, $format;
         if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better
-          unshift @predelete_list, $name, $deletename, $import_sub;
+          unshift @predelete_list, $name, $deletename, $import_sub, $format;
         } else {
-          unshift @delete_list, $name, $deletename, $import_sub;
+          unshift @delete_list, $name, $deletename, $import_sub, $format;
         }
 
       } else {
@@ -1655,10 +1655,9 @@ sub process_download_and_update {
         warn "processing $dir.new/$name.txt\n" if $DEBUG;
         my $olddir = $update ? "$dir.1" : "";
         $difffile = _perform_cch_diff( $name, "$dir.new", $olddir );
-      } else {
-        $difffile =~ s/^$cache_dir//;
-        push @list, "${name}file:$difffile";
       }
+      $difffile =~ s/^$cache_dir//;
+      push @list, "${name}file:$difffile";
     }
 
     # perform the import
-- 
2.11.0