[Libreoffice-commits] .: 2 commits - solenv/bin solenv/inc

[Petr Mladek]

 solenv/bin/modules/installer/download.pm |    2 +-
 solenv/inc/installationtest.mk           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 30024ba0f710fe5a8e5e330768a278f4d0a2fa2a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 4 16:00:16 2010 +0100

    fix smoketest with the improved download tarball (fdo#30837)

diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
index 15a80b0..80de446 100644
--- a/solenv/inc/installationtest.mk
+++ b/solenv/inc/installationtest.mk
@@ -39,7 +39,7 @@ my_instsets = $(shell ls -dt \
 installationtest_instset = $(my_instsets:1)
 .ELSE
 installationtest_instset = \
-    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/$(defaultlangiso)
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/LibreOffice/archive/install
 .END
 
 .IF "$(OS)" == "WNT"
commit c8eddcd9b01811214cb1658b2334207616086047
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Nov 4 15:25:20 2010 +0100

    better name directory with download tarballs

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b7f01ff..8e70bbb 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1951,7 +1951,7 @@ sub create_download_sets
     my $lastdir = $installationdir;
     installer::pathanalyzer::make_absolute_filename_to_relative_filename(\$lastdir);
 
-    if ( $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
+    if ( $installer::globals::iswindowsbuild && $lastdir =~ /\./ ) { $lastdir =~ s/\./_download_inprogress\./ }
     else { $lastdir = $lastdir . "_download_inprogress"; }
 
     # removing existing directory "_native_packed_inprogress" and "_native_packed_witherror" and "_native_packed"