@@ -1618,9 +1618,9 @@ def _find_library_internal(
1618
1618
1619
1619
robot_variables = None
1620
1620
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 )
1623
1622
1623
+ if contains_variable (name , "$@&%" ):
1624
1624
try :
1625
1625
name = robot_variables .replace_string (name , ignore_errors = False )
1626
1626
except DataError as error :
@@ -2048,9 +2048,9 @@ def _find_variables_internal(
2048
2048
2049
2049
_update_env (working_dir )
2050
2050
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 )
2053
2052
2053
+ if contains_variable (name , "$@&%" ):
2054
2054
try :
2055
2055
name = robot_variables .replace_string (name , ignore_errors = False )
2056
2056
except DataError as error :
@@ -2351,8 +2351,8 @@ def find_file(
2351
2351
) -> str :
2352
2352
_update_env (working_dir )
2353
2353
2354
+ robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
2354
2355
if contains_variable (name , "$@&%" ):
2355
- robot_variables = resolve_robot_variables (working_dir , base_dir , command_line_variables , variables )
2356
2356
try :
2357
2357
name = robot_variables .replace_string (name , ignore_errors = False )
2358
2358
except DataError as error :
0 commit comments