From b55ca3fba8b56ec89e8c17516e2497189e2f1222 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Mon, 2 Jun 2008 20:50:39 +0000
Subject: fixed problem reported by Michael: * improved robustness of
 config-demuxer and OSPlugin::Engine with respect   to checking of attributes
 for plugins that no longer exist - now the   config-demuxer will no longer
 fail, but print a warning about non-existing   plugins (and their attributes)
 instead.

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

(limited to 'config-db')

diff --git a/config-db/OpenSLX/AttributeRoster.pm b/config-db/OpenSLX/AttributeRoster.pm
index d8659899..ddd2599d 100644
--- a/config-db/OpenSLX/AttributeRoster.pm
+++ b/config-db/OpenSLX/AttributeRoster.pm
@@ -536,8 +536,11 @@ sub findProblematicValues
         next if !defined $value;
 
         # check the value against the regex of the attribute (if any)
-        my $attrInfo = $AttributeInfo{$key}
-            || die _tr('attribute "%s" is unknown!', $key);
+        my $attrInfo = $AttributeInfo{$key};
+        if (!$attrInfo) {
+            push @problems, _tr('attribute "%s" is unknown!', $key);
+            next;
+        }
         my $regex = $attrInfo->{content_regex};
         if ($regex && $value !~ $regex) {
             push @problems, _tr(
@@ -557,8 +560,7 @@ sub findProblematicValues
             vlog 2, "checking attrs of plugin: $pluginName\n";
             # create & start OSPlugin-engine for vendor-OS and current plugin
             my $engine = OpenSLX::OSPlugin::Engine->new;
-            $engine->initialize($pluginName, $vendorOSName);
-            if (!$engine->{'plugin-path'}) {
+            if (!$engine->initialize($pluginName, $vendorOSName)) {
                 warn _tr(
                     'unable to create engine for plugin "%s"!', $pluginName
                 );
-- 
cgit v1.2.3-55-g7522