From 8675fae4b659f6a47f15110c29c09052602f6853 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Tue, 18 Mar 2008 21:50:25 +0000
Subject: * fixed incorrect behaviour with respect to merging of plugin
 attributes:   we need to push them over the attributes of the default-system,
 not   merge them - reported by Michael

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@1653 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 config-db/OpenSLX/ConfigDB.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'config-db')

diff --git a/config-db/OpenSLX/ConfigDB.pm b/config-db/OpenSLX/ConfigDB.pm
index 5c49646e..8382f066 100644
--- a/config-db/OpenSLX/ConfigDB.pm
+++ b/config-db/OpenSLX/ConfigDB.pm
@@ -2434,11 +2434,11 @@ sub mergeDefaultAttributesIntoSystem
 	my $defaultSystem = $self->fetchSystemByFilter({name => '<<<default>>>'});
 	mergeAttributes($system, $defaultSystem, $originInfo, 'default-system');
 
-	# then merge any attributes found in the plugins that are installed
-	# into the vendor-OS:
+	# push any attributes found in the plugins that are installed into
+	# the vendor-OS:
 	if (ref $installedPlugins eq 'ARRAY' && @$installedPlugins) {
 		for my $plugin (@$installedPlugins) {
-			mergeAttributes($system, $plugin, $originInfo, 'vendor-OS');
+			pushAttributes($system, $plugin, $originInfo, 'vendor-OS');
 		}
 
 		# the above will have merged stage1 attributes, too, so we remove
@@ -2450,6 +2450,7 @@ sub mergeDefaultAttributesIntoSystem
 		}
 	}
 
+	# finally push the attributes specified for the system itself
 	my $defaultClient = $self->fetchClientByFilter({name => '<<<default>>>'});
 	pushAttributes($system, $defaultClient, $originInfo, 'default-client');
 
-- 
cgit v1.2.3-55-g7522