fix: Fix dedicated modules error loading on windows

Closes #780
glpi-project · Oct 8, 2024 · fdeb7fa · fdeb7fa
1 parent 23984da
commit fdeb7fa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -2,6 +2,10 @@ Revision history for GLPI agent
 
 1.12 not yet released
 
+core:
+* fix #780: Avoid module loading path check error on windows if path includes a
+  parenthesis
+
 inventory:
 * Fix rare windows perl error during drives, ipv6 network or videos inventory
 

diff --git a/lib/GLPI/Agent/Tools/PartNumber.pm b/lib/GLPI/Agent/Tools/PartNumber.pm
@@ -27,7 +27,9 @@ sub new {
         my %priority = ();
         my ($_classpath) = $INC{module2file(__PACKAGE__)} =~ /^(.*)\.pm$/;
         $_classpath =~ s{\\}{/}g if $OSNAME eq 'MSWin32';
-        my $subclass_path_re = qr/$_classpath\/(\S+)\.pm$/;
+        my ($_modulepath) = module2file(__PACKAGE__) =~ /^(.*)\.pm$/;
+        $_modulepath =~ s{\\}{/}g if $OSNAME eq 'MSWin32';
+        my $subclass_path_re = qr/$_modulepath\/(\S+)\.pm$/;
         foreach my $file (File::Glob::bsd_glob("$_classpath/*.pm")) {
             $file =~ s{\\}{/}g if $OSNAME eq 'MSWin32';
             my ($class) = $file =~ $subclass_path_re

diff --git a/lib/GLPI/Agent/Tools/USB.pm b/lib/GLPI/Agent/Tools/USB.pm
@@ -25,13 +25,15 @@ sub new {
 
     # Load any related sub-module
     my ($sub_modules_path) = $INC{module2file(__PACKAGE__)} =~ /(.*)\.pm/;
+    $sub_modules_path =~ s{\\}{/}g if $OSNAME eq 'MSWin32';
+    my ($sub_path_check) = module2file(__PACKAGE__) =~ /(.*)\.pm/;
+    $sub_path_check =~ s{\\}{/}g if $OSNAME eq 'MSWin32';
 
     foreach my $file (File::Glob::bsd_glob("$sub_modules_path/*.pm")) {
         if ($OSNAME eq 'MSWin32') {
             $file =~ s{\\}{/}g;
-            $sub_modules_path =~ s{\\}{/}g;
         }
-        next unless $file =~ m{$sub_modules_path/(\S+)\.pm$};
+        next unless $file =~ m{$sub_path_check/(\S+)\.pm$};
 
         my $module = __PACKAGE__ . "::" . $1;
         # reload can be set by unittests