incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1363817 - /incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm
Date Fri, 20 Jul 2012 15:01:01 GMT
Author: jsc
Date: Fri Jul 20 15:01:00 2012
New Revision: 1363817

URL: http://svn.apache.org/viewvc?rev=1363817&view=rev
Log:
merge publisher fix from trunk

Modified:
    incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm

Modified: incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm?rev=1363817&r1=1363816&r2=1363817&view=diff
==============================================================================
--- incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm (original)
+++ incubator/ooo/branches/AOO34/main/solenv/bin/modules/installer/windows/property.pm Fri
Jul 20 15:01:00 2012
@@ -479,7 +479,11 @@ sub update_property_table
 	my $arpcomments = get_arpcomments_for_property_table($allvariables, $languagestringref);
 	my $installlevel = get_installlevel_for_property_table();
 	my $ischeckforproductupdates = get_ischeckforproductupdates_for_property_table();
-	my $manufacturer = get_manufacturer_for_property_table();
+#	my $manufacturer = get_manufacturer_for_property_table();
+# tweak publisher name in the registry to OOOVENDOR=Apache Software Foundation. The global
change of the 
+# manufacturer from "OpenOffice.org" to "Apache Software Foundation" requires more analysis
and testing 
+# because more registry entries/keys are potentially affected. For example test product updates
etc.
+	my $manufacturer = $allvariables->{'OOOVENDOR'};
 	my $productlanguage = get_productlanguage_for_property_table($language);
 	my $productname = get_productname_for_property_table($allvariables);
 	my $productversion = get_productversion_for_property_table();



Mime
View raw message