diff options
author | David Tardon <dtardon@redhat.com> | 2013-06-20 09:23:56 +0200 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2013-06-20 09:50:46 +0200 |
commit | 36b4c3b0836717a414d5dc327eb90200f583a6b9 (patch) | |
tree | 12b78a3a1886af6eb573543c29693e288cedcacf /solenv | |
parent | 722ce13234182692996c586607868a0cd4b039b5 (diff) |
quote $ for files from filelists too
Change-Id: Ice814ea226ddac24325770d038e019e19bc635ce
(cherry picked from commit 4379180aaa6b65e172d366fbf64cbe3cea6d5435)
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/modules/installer.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm index 27244a9ab97b..22b55378012e 100644 --- a/solenv/bin/modules/installer.pm +++ b/solenv/bin/modules/installer.pm @@ -609,13 +609,6 @@ sub run { $filesinproductlanguageresolvedarrayref = installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref, \@additional_paths_from_zipfiles, $languagestringref, $loggingdir); - # packed files sometimes contain a "$" in their name: HighlightText$1.class. For epm the "$" has to be quoted by "$$" - - if (!( $installer::globals::iswindowsbuild || $installer::globals::simple ) ) - { - installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref); - } - ###################################################################################### # Processing files with flag FILELIST and putting listed files into the file list ###################################################################################### @@ -624,6 +617,13 @@ sub run { $filesinproductlanguageresolvedarrayref = installer::filelists::resolve_filelist_flag($filesinproductlanguageresolvedarrayref, $ENV{'INSTDIR'}); + # packed files sometimes contain a "$" in their name: HighlightText$1.class. For epm the "$" has to be quoted by "$$" + + if (!( $installer::globals::iswindowsbuild || $installer::globals::simple ) ) + { + installer::scriptitems::quoting_illegal_filenames($filesinproductlanguageresolvedarrayref); + } + ##################################### # Files with flag SUBST_FILENAME ##################################### |