Bug fix: Module PATH check (#9574)
#9100 added a warning message when a path extracted from a module file did not appear to be a valid filesystem path. This check was applied to a variable which could be a list of paths, which would erroneously trigger the warning. This commit updates the check to run at the actual point where the path has been extracted.
This commit is contained in:
		 Satish Balay
					Satish Balay
				
			
				
					committed by
					
						 Peter Scheibel
						Peter Scheibel
					
				
			
			
				
	
			
			
			 Peter Scheibel
						Peter Scheibel
					
				
			
						parent
						
							31bed8f8f2
						
					
				
				
					commit
					79e25032e8
				
			| @@ -144,11 +144,6 @@ def get_path_arg_from_module_line(line): | ||||
|         path_arg = words_and_symbols[-2] | ||||
|     else: | ||||
|         path_arg = line.split()[2] | ||||
|  | ||||
|     if not os.path.exists(path_arg): | ||||
|         tty.warn("Extracted path from module does not exist:" | ||||
|                  "\n\tExtracted path: " + path_arg + | ||||
|                  "\n\tFull line: " + line) | ||||
|     return path_arg | ||||
|  | ||||
|  | ||||
| @@ -162,7 +157,11 @@ def get_path_from_module(mod): | ||||
|     # Read the module | ||||
|     text = modulecmd('show', mod, output=str, error=str).split('\n') | ||||
|  | ||||
|     return get_path_from_module_contents(text, mod) | ||||
|     p = get_path_from_module_contents(text, mod) | ||||
|     if p and not os.path.exists(p): | ||||
|         tty.warn("Extracted path from module does not exist:" | ||||
|                  "\n\tExtracted path: " + p) | ||||
|     return p | ||||
|  | ||||
|  | ||||
| def get_path_from_module_contents(text, module_name): | ||||
|   | ||||
		Reference in New Issue
	
	Block a user