[Libreoffice-commits] core.git: solenv/bin

[David Tardon]

 solenv/bin/modules/installer/filelists.pm |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 578d3476f0c1bc13ac08cc111f5d758226f4d07b
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 15 07:09:02 2013 +0200

    add error checking into installer/filelist.pm
    
    Change-Id: Iccb314155ac70984fa70e7d1ec839edd9eb14270

diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm
index d3447be..5aa0506 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -40,8 +40,15 @@ sub resolve_filelist_flag
 
                 foreach my $path (@{$filelist})
                 {
-                    # TODO: check that the file is really under $outdir
-                    # TODO: check existence of the file
+                    if ((index $path, $outdir) != 0)
+                    {
+                        installer::logger::print_error("file '$path' is not in '$outdir'");
+                    }
+                    if (!-f $path)
+                    {
+                        installer::logger::print_error("file '$path' does not exist");
+                    }
+
                     my $subpath = substr $path, ((length $outdir) + 1); # drop separator too
 
                     my %newfile = ();