use versioned path in download tarballs (fdo#30837)

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);

solenv/bin/modules/installer/systemactions.pm

@@ -395,20 +395,29 @@ sub create_directories
 
         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);
         }
     }