INTEGRATION: CWS writerfilter (1.6.84); FILE MERGED

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

1 files changed, 13 insertions, 2 deletions

diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 1abbf714bbcc..962483d87fe4 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -4,9 +4,9 @@
 #
 #   $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 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_ONLY" ) { $rootvalue = 2; }
+
     return $rootvalue;
 }
 
@@ -241,6 +243,15 @@ sub create_registry_table
                 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"
                         . $registry{'Name'} . "\t" . $registry{'Value'} . "\t" . $registry{'Component_'} . "\n";