summaryrefslogtreecommitdiff
path: root/solenv/bin/modules/installer/systemactions.pm
diff options
context:
space:
mode:
Diffstat (limited to 'solenv/bin/modules/installer/systemactions.pm')
-rw-r--r--solenv/bin/modules/installer/systemactions.pm37
1 files changed, 23 insertions, 14 deletions
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);