strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS writerfilter (1.6.84); FILE MERGED

Browse source 
2005/11/16 10:10:23 is 1.6.84.2: #127314# always registering in HKLM
2005/11/14 16:37:02 is 1.6.84.1: #127314# new odt4word product
This commit is contained in:
Oliver Bolte 2006-09-15 13:37:12 +00:00
parent 46dcf92a27
commit bbbeab164c
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
solenv/bin/modules/installer/windows/registry.pm
View file

@ -4,9 +4,9 @@
# #
# $RCSfile: registry.pm,v $ # $RCSfile: registry.pm,v $
# #
# $Revision: 1.6 $ # $Revision: 1.7 $
# #
# last change: $Author: rt $ $Date: 2005-09-08 09:20:54 $ # last change: $Author: obo $ $Date: 2006-09-15 14:37:12 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -124,6 +124,8 @@ sub get_registry_root
if ( $scproot eq "PREDEFINED_HKEY_LOCAL_MACHINE" ) { $rootvalue = -1; } if ( $scproot eq "PREDEFINED_HKEY_LOCAL_MACHINE" ) { $rootvalue = -1; }
if ( $scproot eq "PREDEFINED_HKEY_LOCAL_MACHINE_ONLY" ) { $rootvalue = 2; }
return $rootvalue; return $rootvalue;
} }
@ -241,6 +243,15 @@ sub create_registry_table
push(@{$allregistrycomponentsref}, $registry{'Component_'}); push(@{$allregistrycomponentsref}, $registry{'Component_'});
} }
# Collecting all component conditions
if ( $oneregistry->{'ComponentCondition'} )
{
if ( ! exists($installer::globals::componentcondition{$registry{'Component_'}}))
{
$installer::globals::componentcondition{$registry{'Component_'}} = $oneregistry->{'ComponentCondition'};
}
}
my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t" my $oneline = $registry{'Registry'} . "\t" . $registry{'Root'} . "\t" . $registry{'Key'} . "\t"
. $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n"; . $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";