diff options
| author | Petr Mladek <pmladek@suse.cz> | 2010-11-03 21:20:18 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2010-11-03 21:20:18 +0100 |
| commit | d166e81980fb8f02411005862d5ab5b3a4f57bdd (patch) | |
| tree | d695679cbfee99287d4963ae2d64eb78d9488a1a | |
| parent | e45e52f5a3e2b48e7a3b0a395b0ce444b6fb9828 (diff) | |
use versioned path in download tarballs (fdo#30837)
| -rw-r--r-- | solenv/bin/make_installer.pl | 3 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 37 |
2 files changed, 26 insertions, 14 deletions
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 441f28d94..4c464fa96 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -1292,6 +1292,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) # Creating directories #################################################### + if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { installer::download::set_download_filename($languagestringref, $allvariableshashref); } + else { installer::download::resolve_variables_in_downloadname($allvariableshashref, "", $languagestringref); } + $installdir = installer::worker::create_installation_directory($shipinstalldir, $languagestringref, \$current_install_number); my $listfiledir = installer::systemactions::create_directories("listfile", $languagestringref); diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index e3ef783cb..aebe20ff4 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -390,29 +390,38 @@ sub create_directories $path = $path . $newdirectory . $installer::globals::separator; create_directory($path); - + my $locallanguagesref = ""; - + if ( $$languagesref ) { $locallanguagesref = $$languagesref; } - if (!($locallanguagesref eq "" )) # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files + if ($newdirectory eq "install" ) { - my $languagestring = $$languagesref; - - if (length($languagestring) > $installer::globals::max_lang_length ) + # put packages into versioned path (fdo#30837) + $path = $path . "$installer::globals::ooodownloadfilename"; + } + else + { + if ($locallanguagesref ne "") # this will be a path like "01_49", for Profiles and ConfigurationFiles, idt-Files { - my $number_of_languages = get_number_of_langs($languagestring); - chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`); - # $languagestring = $shorter; - my $id = substr($shorter, 0, 8); # taking only the first 8 digits - $languagestring = "lang_" . $number_of_languages . "_id_" . $id; - } - $path = $path . $languagestring . $installer::globals::separator; + my $languagestring = $$languagesref; + + if (length($languagestring) > $installer::globals::max_lang_length ) + { + my $number_of_languages = get_number_of_langs($languagestring); + chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`); + # $languagestring = $shorter; + my $id = substr($shorter, 0, 8); # taking only the first 8 digits + $languagestring = "lang_" . $number_of_languages . "_id_" . $id; + } + + $path = $path . $languagestring . $installer::globals::separator; + } create_directory($path); } } - + installer::remover::remove_ending_pathseparator(\$path); $path = installer::converter::make_path_conform($path); |