[Bps-public-commit] rtx-migrate branch, master, updated. 0.14-6-g05e2e41

[Kevin Falcone]

The branch, master has been updated
       via  05e2e41cccdbce696b1fa337e77bd8ece31c0a1e (commit)
      from  3d6cd798344165be150eb62ee05265ef2b7173e7 (commit)

Summary of changes:
 lib/RT/Migrate/Importer/File.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 05e2e41cccdbce696b1fa337e77bd8ece31c0a1e
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jan 15 13:30:12 2014 -0500

    Importer: If the serializer wrote absoolute paths, be sure to trim them
    
    3d9985d8 trimmed the stored path from the list of files, but only the
    first level, and only functioned if the directory was relative, not
    absolute.  Trim and replace the entire path, which makes archives
    created with `rt-serialize --directory /tmp/rt` load correctly.
    
    Closes [issues #28434].

diff --git a/lib/RT/Migrate/Importer/File.pm b/lib/RT/Migrate/Importer/File.pm
index dd1808f..05d39a5 100644
--- a/lib/RT/Migrate/Importer/File.pm
+++ b/lib/RT/Migrate/Importer/File.pm
@@ -85,7 +85,7 @@ sub Import {
     my $dir = $self->{Directory};
 
     if ($self->{Metadata} and $self->{Metadata}{Files}) {
-        $self->{Files} = [ map {s|^.*?/|$dir/|;$_} @{$self->{Metadata}{Files}} ];
+        $self->{Files} = [ map {s|^.*/|$dir/|;$_} @{$self->{Metadata}{Files}} ];
     } else {
         $self->{Files} = [ <$dir/*.dat> ];
     }

-----------------------------------------------------------------------