Author: orw
Date: Wed Dec 12 15:11:08 2012
New Revision: 1420740
URL: http://svn.apache.org/viewvc?rev=1420740&view=rev
Log:
#121466# - no need to have different $REGISTRYLAYERNAME, if BUILD_SPECIAL is set
Modified:
openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
Modified: openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm?rev=1420740&r1=1420739&r2=1420740&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/ziplist.pm Wed Dec 12
15:11:08 2012
@@ -674,13 +674,6 @@ sub set_default_productversion_if_requir
{
$allvariables->{'PRODUCTVERSION'} = 1; # FAKE
}
-
- # Creating differentiators for BUILD_SPECIAL in layering
- if ( ! $ENV{'BUILD_SPECIAL'} )
- {
- if ( $allvariables->{'REGISTRYLAYERNAME'} ) {
$allvariables->{'REGISTRYLAYERNAME'} = $allvariables->{'REGISTRYLAYERNAME'} .
"_"; }
- if (( $installer::globals::iswindowsbuild ) && (
$allvariables->{'BASISROOTNAME'} )) { $allvariables->{'BASISROOTNAME'} =
$allvariables->{'BASISROOTNAME'} . "_"; }
- }
}
####################################################
