mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-29 19:50:40 +00:00
launcher:scenario: Fix the way we compute scenario path/name when paths supplied
We were just iterating over the list without any check and could end up with a patch that was not corresponding to the actual scenario.
This commit is contained in:
parent
1623f7111c
commit
64afff0c3e
1 changed files with 10 additions and 9 deletions
|
@ -1950,15 +1950,16 @@ class ScenarioManager(Loggable):
|
|||
for section in config.sections():
|
||||
if scenario_paths:
|
||||
for scenario_path in scenario_paths:
|
||||
if mfile is None:
|
||||
name = section
|
||||
path = scenario_path
|
||||
elif section in scenario_path:
|
||||
# The real name of the scenario is:
|
||||
# filename.REALNAME.scenario
|
||||
name = scenario_path.replace(mfile + ".", "").replace(
|
||||
"." + self.FILE_EXTENSION, "")
|
||||
path = scenario_path
|
||||
if section in os.path.splitext(os.path.basename(scenario_path))[0]:
|
||||
if mfile is None:
|
||||
name = section
|
||||
path = scenario_path
|
||||
else:
|
||||
# The real name of the scenario is:
|
||||
# filename.REALNAME.scenario
|
||||
name = scenario_path.replace(mfile + ".", "").replace(
|
||||
"." + self.FILE_EXTENSION, "")
|
||||
path = scenario_path
|
||||
else:
|
||||
name = section
|
||||
path = None
|
||||
|
|
Loading…
Reference in a new issue