From e0aa5e6f3a6d6702a2c6b8cd1d807bfc4a48d8df Mon Sep 17 00:00:00 2001
From: Tim Retout <tim@retout.co.uk>
Date: Thu, 30 Aug 2012 18:37:16 +0100
Subject: installer: Make @forced_properties non-global.

Change-Id: I42f1511126bcbda466cb956cbcac722b449bd9a5
---
 solenv/bin/modules/installer/globals.pm     |  2 --
 solenv/bin/modules/installer/setupscript.pm | 16 ++++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 49f380cb8fea..2c63ab41f0f0 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -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 = ();
 
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index 2275cd10096e..53590d34bc92 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -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} = "";
+        }
     }
 }
 
-- 
cgit