Kaydet (Commit) fcecf91f authored tarafından Petr Mladek's avatar Petr Mladek

fallback to the old install dirname if ooodownloadfilename is not defined

the check for versioned install dir (fdo#30837) broke creation of
languagepack on Windows and MAC; it is because ooodownloadfilename
was defined only for linux; we still need lang-specific directory
for other archs
üst 661b074b
......@@ -290,10 +290,10 @@ sub create_directories
if ( $$languagesref ) { $locallanguagesref = $$languagesref; }
if ($newdirectory eq "install" )
if ($newdirectory eq "install" && $installer::globals::ooodownloadfilename ne "" )
{
# put packages into versioned path (fdo#30837)
$path = $path . "$installer::globals::ooodownloadfilename";
# put packages into versioned path; needed only on linux (fdo#30837)
$path = $path . "$installer::globals::ooodownloadfilename" . $installer::globals::separator;
create_directory($path);
}
else
......@@ -311,7 +311,7 @@ sub create_directories
$languagestring = "lang_" . $number_of_languages . "_id_" . $id;
}
$path = $path . $languagestring . $installer::globals::separator;
$path = $path . $languagestring . $installer::globals::separator;
create_directory($path);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment