From 9a5183ddad4d361c406823fb56bb68b27e43063e Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 18 Jan 2013 19:16:19 +0100
Subject: installer: remove SERVICETAG remnants of product registration

Change-Id: Ic87bb4666bcc4b28476dbfe2193a8330413547cf
---
 solenv/bin/modules/installer.pm              |  3 ---
 solenv/bin/modules/installer/setupscript.pm  | 25 -------------------------
 solenv/bin/modules/t/installer-setupscript.t |  1 -
 3 files changed, 29 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 4df3bc759b42..91b3ef0c5eed 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -280,9 +280,6 @@ sub run {
 
     installer::setupscript::add_installationobject_to_variables($allvariableshashref, $allscriptvariablesref);
 
-    # Adding also all variables, that must be included into the $allvariableshashref.
-    installer::setupscript::add_forced_properties($allvariableshashref);
-
     # Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME)
     installer::setupscript::replace_preset_properties($allvariableshashref);
 
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index 53590d34bc92..08d20cf4c3b6 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -37,7 +37,6 @@ use installer::scriptitems;
 use installer::ziplist;
 
 our @EXPORT_OK = qw(
-    add_forced_properties
     add_installationobject_to_variables
     add_lowercase_productname_setupscriptvariable
     add_predefined_folder
@@ -462,30 +461,6 @@ sub add_installationobject_to_variables
     }
 }
 
-#####################################################################################
-# Adding all variables, that must be defined, but are not defined until now.
-#####################################################################################
-
-sub add_forced_properties
-{
-    my ($allvariables) = @_;
-
-    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} = "";
-        }
-    }
-}
-
 #####################################################################################
 # Some properties are created automatically. It should be possible to
 # overwrite them, with PRESET properties. For example UNIXPRODUCTNAME
diff --git a/solenv/bin/modules/t/installer-setupscript.t b/solenv/bin/modules/t/installer-setupscript.t
index 1320d7f4282f..2079efea6aff 100644
--- a/solenv/bin/modules/t/installer-setupscript.t
+++ b/solenv/bin/modules/t/installer-setupscript.t
@@ -32,7 +32,6 @@ use lib '.';
 
 BEGIN {
     use_ok('installer::setupscript', qw(
-        add_forced_properties
         add_installationobject_to_variables
         add_lowercase_productname_setupscriptvariable
         add_predefined_folder
-- 
cgit