@@ -1618,9 +1618,9 @@ def _find_library_internal(
16181618
16191619 robot_variables = None
16201620
1621- if contains_variable (name , "$@&%" ):
1622- robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
1621+ robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
16231622
1623+ if contains_variable (name , "$@&%" ):
16241624 try :
16251625 name = robot_variables .replace_string (name , ignore_errors = False )
16261626 except DataError as error :
@@ -2048,9 +2048,9 @@ def _find_variables_internal(
20482048
20492049 _update_env (working_dir )
20502050
2051- if contains_variable (name , "$@&%" ):
2052- robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
2051+ robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
20532052
2053+ if contains_variable (name , "$@&%" ):
20542054 try :
20552055 name = robot_variables .replace_string (name , ignore_errors = False )
20562056 except DataError as error :
@@ -2351,8 +2351,8 @@ def find_file(
23512351) -> str :
23522352 _update_env (working_dir )
23532353
2354+ robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
23542355 if contains_variable (name , "$@&%" ):
2355- robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
23562356 try :
23572357 name = robot_variables .replace_string (name , ignore_errors = False )
23582358 except DataError as error :
0 commit comments