[Libreoffice-commits] .: solenv/bin

Miklos Vajna vmiklos at kemper.freedesktop.org
Sat Dec 31 05:34:50 PST 2011


 solenv/bin/modules/installer/scriptitems.pm |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 21fa99f44c200937f6ec2b7028b482b71457161b
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sat Dec 31 14:33:27 2011 +0100

    Fix two perl warnings during make dev-install

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5a4dbb3..a8963a4 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -845,7 +845,9 @@ sub replace_setup_variables
         $value =~ s/\<sourceid\>/$installer::globals::build/;
         $value =~ s/\<updateid\>/$updateid/;
         $value =~ s/\<pkgformat\>/$installer::globals::packageformat/;
+        $ENV{'OOO_VENDOR'} = "" if !defined $ENV{'OOO_VENDOR'};
         $value =~ s/\<vendor\>/$ENV{'OOO_VENDOR'}/;
+        $ENV{'BUILD_VER_STRING'} = "" if !defined $ENV{'BUILD_VER_STRING'};
         $value =~ s/\<buildversion\>/$ENV{'BUILD_VER_STRING'}/;
 
         $oneitem->{'Value'} = $value;


More information about the Libreoffice-commits mailing list