solenv/bin/modules/installer/scriptitems.pm | 2 +- solenv/bin/modules/installer/simplepackage.pm | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit 42f8c6feccb3168d1a39683497e7a6ec6e7215a8 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Oct 31 22:00:57 2013 +0100 Disambiguate where a "Source for ... not found!" error originates from Change-Id: I424036d3a940fa53b1553c1c539bf1065cdc2759 diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index b3d106a..fe767f7 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -916,7 +916,7 @@ sub get_sourcepath_from_filename_and_includepath_classic $onefile = ""; # the sourcepath has to be empty if ( $write_logfile) { - $infoline = "ERROR: Source for $$searchfilenameref not found!\n"; # Important message in log file + $infoline = "ERROR: Source for $$searchfilenameref not found (classic)!\n"; # Important message in log file push( @installer::globals::logfileinfo, $infoline); } } commit 2208fca2feb0360af95c7cb1bbe663577084bd15 Author: Stephan Bergmann <sberg...@redhat.com> Date: Thu Oct 31 21:59:04 2013 +0100 $installer::globals::macinstallfilename is already an absolute pathname Change-Id: I35ced0ef75f6b411807f24ecc19b4f2a9622f98c diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 8ed693f..da58b40 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -345,15 +345,12 @@ sub create_package my $scripthelperfilename = $ENV{'SRCDIR'} . "/setup_native/scripts/mac_install.script"; # my $scripthelperrealfilename = $volume_name; my $scripthelperrealfilename = $volume_name_classic_app; - my $translationfilename = $installer::globals::macinstallfilename; # Finding both files in source tree my $scriptref = $ENV{'SRCDIR'} . "/setup_native/scripts/" . $scriptfilename; if (! -f $scriptref) { installer::exiter::exit_program("ERROR: Could not find Apple script $scriptfilename ($scriptref)!", "create_package"); } if (! -f $scripthelperfilename) { installer::exiter::exit_program("ERROR: Could not find Apple script $scripthelperfilename!", "create_package"); } - my $translationfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath( \$translationfilename, $includepatharrayref, 0); - if ($$translationfileref eq "") { installer::exiter::exit_program("ERROR: Could not find Apple script translation file $translationfilename ( includepatharrayref = $includepatharrayref )", "create_package"); } $scriptfilename = $contentsfolder . "/" . $scriptrealfilename; $scripthelperrealfilename = $contentsfolder . "/" . $scripthelperrealfilename; @@ -364,7 +361,7 @@ sub create_package # Replacing variables in script $scriptfilename # Localizing script $scriptfilename my $scriptfilecontent = installer::files::read_file($scriptfilename); - my $translationfilecontent = installer::files::read_file($$translationfileref); + my $translationfilecontent = installer::files::read_file($installer::globals::macinstallfilename); localize_scriptfile($scriptfilecontent, $translationfilecontent, $languagestringref); # replace_variables_in_scriptfile($scriptfilecontent, $volume_name, $allvariables); replace_variables_in_scriptfile($scriptfilecontent, $volume_name_classic, $volume_name_classic_app, $allvariables); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits