[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.0' - solenv/bin

Andras Timar andras.timar at collabora.com
Sat Oct 12 11:30:42 PDT 2013


 solenv/bin/modules/installer/windows/feature.pm |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit a620d0f01cd15e6f24475490ec93d67f4ceb347f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sat Oct 12 10:00:51 2013 -0700

    fdo#33798 msidbFeatureAttributesUIDisallowAbsent for hidden feat.
    
    Change-Id: I0c8788f88b3c219e789af7f8bfa79e5dd31c5b3a

diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index 33aa351..83a5897 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -189,6 +189,7 @@ sub get_feature_attributes
     if ( $onefeature->{'ParentID'} ) { $parentgid = $onefeature->{'ParentID'}; }
 
     if (( $parentgid eq "" ) || ( $parentgid eq $installer::globals::rootmodulegid )) { $attributes = "8"; }
+    elsif ( get_feature_display($onefeature) eq "0" ) { $attributes = "26"; } # fdo#33798
     else { $attributes = "10"; }
 
     return $attributes


More information about the Libreoffice-commits mailing list