use UNIVERSAL::require, instead of require keyword

fusioninventory · Jan 10, 2012 · a4ebd21 · a4ebd21
1 parent 9581ed0
commit a4ebd21
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Screen.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/Screen.pm
@@ -73,20 +73,26 @@ sub _getScreensFromWindows {
 
     my $devices = {};
     my $Registry;
-    eval {
-        require FusionInventory::Agent::Tools::Win32;
-        require Win32::TieRegistry;
-        Win32::TieRegistry->import(
-            Delimiter   => '/',
-            ArrayValues => 0,
-            TiedRef     => \$Registry
-        );
-    };
+
+    FusionInventory::Agent::Tools::Win32->require();
+    if ($EVAL_ERROR) {
+        print
+            "Failed to load FusionInventory::Agent::Tools::Win32: $EVAL_ERROR";
+        return;
+    }
+
+    Win32::TieRegistry->require();
     if ($EVAL_ERROR) {
-        print "Failed to load Win32::OLE and Win32::TieRegistry\n";
+        print "Failed to load Win32::TieRegistry: $EVAL_ERROR";
         return;
     }
 
+    Win32::TieRegistry->import(
+        Delimiter   => '/',
+        ArrayValues => 0,
+        TiedRef     => \$Registry
+    );
+
     use constant wbemFlagReturnImmediately => 0x10;
     use constant wbemFlagForwardOnly => 0x20;