Changeset 19760 for gsdl/trunk/bin/script/import.pl

Timestamp:

2009-06-08T15:26:47+12:00 (15 years ago)

Author:

davidb

Message:

Files in the GSDL tmp area area deleted between builds, however they are remembered in the archiveinf-*.gdb files. This results in files being reprocessed during incremental build because some of the supporting files (i.e. those in GSDL/tmp) have changed (i.e. no longer there). Current fix is to filter out any files in the GSDL/tmp and GSDLCOLLECTDIR/tmp areas

File:

• gsdl/trunk/bin/script/import.pl (modified) (1 diff)

gsdl/trunk/bin/script/import.pl

@@ -601 +601 @@
         
         my @deleted_files = sort keys %{$block_hash->{'deleted_files'}};
+        # Filter out any in gsdl/tmp area
+        my @filtered_deleted_files = ();
+        my $gsdl_tmp_area = &util::filename_cat($ENV{'GSDLHOME'}, "tmp");
+        my $collect_tmp_area = &util::filename_cat($ENV{'GSDLCOLLECTDIR'}, "tmp");
+        $gsdl_tmp_area = &util::filename_to_regex($gsdl_tmp_area);
+        $collect_tmp_area = &util::filename_to_regex($collect_tmp_area);
+
+
+        foreach my $df (@deleted_files) {
+        next if ($df =~ m/^$gsdl_tmp_area/);
+        next if ($df =~ m/^$collect_tmp_area/);
+        
+        push(@filtered_deleted_files,$df);
+        }
+
+        
+        @deleted_files = @filtered_deleted_files;
+
         if (scalar(@deleted_files>0)) {
         print STDERR "Files deleted since last import:\n  ";