Merge remote-tracking branch 'forge/2.3.x' into 2.3.x

fusioninventory · Dec 9, 2012 · 22d08e2 · 22d08e2
2 parents c3ecea8 + c02cd2f
commit 22d08e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/lib/FusionInventory/Agent/Config.pm b/lib/FusionInventory/Agent/Config.pm
@@ -240,7 +240,11 @@ sub _checkContent {
             no-category
             /) {
 
-        $self->{$option} = [ split(/,/, $self->{$option}) ];
+        if ($self->{$option}) {
+            $self->{$option} = [split(/,/, $self->{$option})];
+        } else {
+            $self->{$option} = [];
+        }
     }
 
     # files location

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/USB.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Generic/USB.pm
@@ -15,7 +15,7 @@ sub doInventory {
 
     my $inventory = $params{inventory};
 
-    foreach my $device (_getDevices(logger => $params{logger})) {
+    foreach my $device (_getDevices(logger => $params{logger}, datadir => $params{datadir})) {
         $inventory->addEntry(
             section => 'USBDEVICES',
             entry   => $device,

diff --git a/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/USB.pm b/lib/FusionInventory/Agent/Task/Inventory/Input/Win32/USB.pm
@@ -15,7 +15,7 @@ sub doInventory {
 
     my $inventory = $params{inventory};
 
-    foreach my $device (_getDevices(logger => $params{logger})) {
+    foreach my $device (_getDevices(logger => $params{logger}, datadir => $params{datadir})) {
         $inventory->addEntry(
             section => 'USBDEVICES',
             entry   => $device