solenv/bin/modules/installer/windows/property.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6e83ae5b4cb52845231489d2f0d9bc380f0522be
Author: Andras Timar <ati...@suse.com>
Date: Wed Apr 11 16:01:06 2012 +0200
set correct value of FINDPRODUCT property
(cherry picked from commit ee7084c4f720c932df67c8ff033dab4d8d556179)
Signed-off-by: Caolán McNamara <caol...@redhat.com>
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 1e6e921..7113a01 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -256,9 +256,9 @@ sub set_important_properties
push(@{$propertyfile}, $onepropertyline);
}
- if (( $allvariables->{'PRODUCTNAME'} ) && (
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'MANUFACTURER'} ) && (
$allvariables->{'PRODUCTCODE'} ))
+ if (( $allvariables->{'PRODUCTNAME'} ) && (
$allvariables->{'PRODUCTVERSION'} ) && ( $allvariables->{'REGISTRYLAYERNAME'} ))
{
- my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\" .
$allvariables->{'MANUFACTURER'} . "\\" . $allvariables->{'PRODUCTNAME'} .
$allvariables->{'PRODUCTADDON'} . "\\" . $allvariables->{'PRODUCTVERSION'} .
"\\" . $allvariables->{'PRODUCTCODE'} . "\n";
+ my $onepropertyline = "FINDPRODUCT" . "\t" . "Software\\LibreOffice" .
"\\" . $allvariables->{'REGISTRYLAYERNAME'} . "\\" .
$allvariables->{'PRODUCTNAME'} . "\\" . $allvariables->{'PRODUCTVERSION'} .
"\n";
push(@{$propertyfile}, $onepropertyline);
}
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
