Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions xacro/substitution_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

import math
import os
import shlex
import yaml

from io import StringIO
Expand Down Expand Up @@ -332,10 +333,10 @@ def _resolve_args(arg_str, context, commands):
valid = ['find', 'env', 'optenv', 'dirname', 'arg']
resolved = arg_str
for a in _collect_args(arg_str):
splits = [s for s in a.split(' ') if s]
if not splits[0] in valid:
splits = shlex.split(a)
if splits[0] not in valid:
raise SubstitutionException('Unknown substitution command [%s]. '
'Valid commands are %s' % (a, valid))
'Valid commands are %s' % (splits[0], valid))
command = splits[0]
args = splits[1:]
if command in commands:
Expand Down