Kaydet (Commit) e0aa5e6f authored tarafından Tim Retout's avatar Tim Retout

installer: Make @forced_properties non-global.

Change-Id: I42f1511126bcbda466cb956cbcac722b449bd9a5
üst 21284778
......@@ -289,8 +289,6 @@ BEGIN
%all_english_languagestrings = ();
%all_required_english_languagestrings = ();
@forced_properties = ("SERVICETAG_PRODUCTNAME", "SERVICETAG_PRODUCTVERSION", "SERVICETAG_PARENTNAME", "SERVICETAG_SOURCE", "SERVICETAG_URN");
@removedirs = ();
@removefiletable = ();
......
......@@ -464,17 +464,25 @@ sub add_installationobject_to_variables
#####################################################################################
# Adding all variables, that must be defined, but are not defined until now.
# List of this varibles: @installer::globals::forced_properties
#####################################################################################
sub add_forced_properties
{
my ($allvariables) = @_;
my $property;
foreach $property ( @installer::globals::forced_properties )
my @forced_properties = qw(
SERVICETAG_PRODUCTNAME
SERVICETAG_PRODUCTVERSION
SERVICETAG_PARENTNAME
SERVICETAG_SOURCE
SERVICETAG_URN
);
for my $property (@forced_properties)
{
if ( ! exists($allvariables->{$property}) ) { $allvariables->{$property} = ""; }
if ( ! exists($allvariables->{$property}) ) {
$allvariables->{$property} = "";
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment