michaelh/zephyr
1
0
Fork 0
Code Releases Activity

runners: misc-flasher: hotfix

Browse source 
The 'command' command line argument for this flasher is now being
overridden by common code, which attaches the west subcommand name to
this.

Let's just hotfix this by renaming the argument in misc-flasher.
We can revisit the boundary between run_common.py arguments and
runners package arguments after the release.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2020-03-04 08:57:22 -08:00 • committed by Johan Hedberg
commit 67d8f755e2
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
scripts/west_commands/runners/misc.py
View file

@ -15,13 +15,13 @@ from runners.core import ZephyrBinaryRunner, RunnerCaps
class MiscFlasher(ZephyrBinaryRunner):
'''Runner for handling special purpose flashing commands.'''
def __init__(self, cfg, command, args):
def __init__(self, cfg, cmd, args):
super().__init__(cfg)
if not command:
if not cmd:
# This is a board definition error, not a user error,
# so we can do it now and not in do_run().
raise ValueError('no command was given')
self.command = command
self.cmd = cmd
self.args = args
@classmethod
@ -34,7 +34,7 @@ class MiscFlasher(ZephyrBinaryRunner):
@classmethod
def do_add_parser(cls, parser):
parser.add_argument('command',
parser.add_argument('cmd',
help='''command to run; it will be passed the
build directory as its first argument''')
parser.add_argument('args', nargs='*',
@ -43,8 +43,8 @@ class MiscFlasher(ZephyrBinaryRunner):
@classmethod
def create(cls, cfg, args):
return MiscFlasher(cfg, args.command, args.args)
return MiscFlasher(cfg, args.cmd, args.args)
def do_run(self, *args, **kwargs):
self.require(self.command)
self.check_call([self.command, self.cfg.build_dir] + self.args)
self.require(self.cmd)
self.check_call([self.cmd, self.cfg.build_dir] + self.args)