Skip to content

Commit cdb20ae

Browse files
alexnavttsjahr
andauthored
Fix xacro args loading issue (#2684)
* Fixed xacro args loading issue * Formatting fixes with pre-commit action --------- Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
1 parent 281efe8 commit cdb20ae

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

moveit_configs_utils/moveit_configs_utils/moveit_configs_builder.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -173,20 +173,20 @@ def __init__(
173173
if setup_assistant_file.exists():
174174
setup_assistant_yaml = load_yaml(setup_assistant_file)
175175
config = setup_assistant_yaml.get("moveit_setup_assistant_config", {})
176-
urdf_config = config.get("urdf", config.get("URDF"))
177-
if urdf_config and self.__urdf_package is None:
178-
self.__urdf_package = Path(
179-
get_package_share_directory(urdf_config["package"])
180-
)
181-
self.__urdf_file_path = Path(urdf_config["relative_path"])
182176

183-
if (xacro_args := urdf_config.get("xacro_args")) is not None:
177+
if urdf_config := config.get("urdf", config.get("URDF")):
178+
if self.__urdf_package is None:
179+
self.__urdf_package = Path(
180+
get_package_share_directory(urdf_config["package"])
181+
)
182+
self.__urdf_file_path = Path(urdf_config["relative_path"])
183+
184+
if xacro_args := urdf_config.get("xacro_args"):
184185
self.__urdf_xacro_args = dict(
185186
arg.split(":=") for arg in xacro_args.split(" ") if arg
186187
)
187188

188-
srdf_config = config.get("srdf", config.get("SRDF"))
189-
if srdf_config:
189+
if srdf_config := config.get("srdf", config.get("SRDF")):
190190
self.__srdf_file_path = Path(srdf_config["relative_path"])
191191

192192
if not self.__urdf_package or not self.__urdf_file_path:

0 commit comments

Comments
 (0)