From aaeea4459938d01d6b0707c76c2e77bd6056881a Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Fri, 11 Sep 2020 16:41:55 +0000 Subject: [PATCH] BUG: #1110 fix possible float to str conversion issue Former-commit-id: 95dddd4fc480f6e9023f6e77f46450a185576262 --- opendm/remote.py | 2 +- stages/splitmerge.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opendm/remote.py b/opendm/remote.py index 029d3493..d520f653 100644 --- a/opendm/remote.py +++ b/opendm/remote.py @@ -474,7 +474,7 @@ class ToolchainTask(Task): argv = get_submodel_argv(config.config(), submodels_path, submodel_name) # Re-run the ODM toolchain on the submodel - system.run(" ".join(map(quote, argv)), env_vars=os.environ.copy()) + system.run(" ".join(map(quote, map(str, argv))), env_vars=os.environ.copy()) # This will only get executed if the command above succeeds self.touch(completed_file) diff --git a/stages/splitmerge.py b/stages/splitmerge.py index d17d7e07..69e05dd6 100644 --- a/stages/splitmerge.py +++ b/stages/splitmerge.py @@ -216,7 +216,7 @@ class ODMSplitStage(types.ODM_Stage): argv = get_submodel_argv(args, tree.submodels_path, sp_octx.name()) # Re-run the ODM toolchain on the submodel - system.run(" ".join(map(quote, argv)), env_vars=os.environ.copy()) + system.run(" ".join(map(quote, map(str, argv))), env_vars=os.environ.copy()) else: lre.set_projects([os.path.abspath(os.path.join(p, "..")) for p in submodel_paths]) lre.run_toolchain()