File tree Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -5,6 +5,8 @@ Revision history for GLPI agent
55core:
66* fix #780: Avoid module loading path check error on windows if path includes a
77 parenthesis
8+ * fix #789: Avoid warning on commandline about possible confusion when reading quoted
9+ configuration value including a dash from configuration file
810
911inventory:
1012* Fix rare windows perl error during drives, ipv6 network or videos inventory
Original file line number Diff line number Diff line change @@ -256,11 +256,7 @@ sub loadFromFile {
256256
257257 # Extract value from quotes or clean any comment including preceding spaces
258258 if ($val =~ / ^(['"])([^\1 ]*)\1 / ) {
259- my ($quote , $extract ) = ( $1 , $2 );
260- $val =~ s /\s *#.+$// ;
261- warn " Config: We may have been confused for $key quoted value, our extracted value: '$extract '\n "
262- if ($val ne " $quote$extract$quote " );
263- $val = $extract ;
259+ $val = $2 ;
264260 } else {
265261 $val =~ s /\s *#.+$// ;
266262 }
@@ -277,11 +273,7 @@ sub loadFromFile {
277273 } elsif ($line =~ / ^\s *include\s +(.+)$ /i ) {
278274 my $include = $1 ;
279275 if ($include =~ / ^(['"])([^\1 ]*)\1 / ) {
280- my ($quote , $extract ) = ( $1 , $2 );
281- $include =~ s /\s *#.+$// ;
282- warn " Config: We may have been confused for include quoted path, our extracted path: '$extract '\n "
283- if ($include ne " $quote$extract$quote " );
284- $include = $extract ;
276+ $include = $2 ;
285277 } else {
286278 $include =~ s /\s *#.+$// ;
287279 }
You can’t perform that action at this time.
0 commit comments