diff options
| author | Ferenc Gerlits <fgerlits@gmail.com> | 2021-04-29 21:52:38 +0200 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-05-03 12:48:08 -0400 |
| commit | faf786d57f48bc516c530bfd76e478b3748cd582 (patch) | |
| tree | d0547b018122e2f196bdfa412c2ddc27bf23c53a /gr-utils/modtool/cli/add.py | |
| parent | 79d294331ca941cd16c42ddc07278c5ce749b938 (diff) | |
modtool: improve the 'invalid name' error message
also fix some validations which checked a prefix instead of the whole name
Signed-off-by: Ferenc Gerlits <fgerlits@gmail.com>
Diffstat (limited to 'gr-utils/modtool/cli/add.py')
| -rw-r--r-- | gr-utils/modtool/cli/add.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gr-utils/modtool/cli/add.py b/gr-utils/modtool/cli/add.py index 40198ebd43..8078f61a0a 100644 --- a/gr-utils/modtool/cli/add.py +++ b/gr-utils/modtool/cli/add.py @@ -15,7 +15,7 @@ import getpass import click -from ..core import ModToolAdd +from ..core import ModToolAdd, validate_name from ..tools import SequenceCompleter, ask_yes_no from .base import common_params, block_name, run, cli_input, ModToolException @@ -90,8 +90,7 @@ def get_blockname(self): if not self.info['blockname'] or self.info['blockname'].isspace(): while not self.info['blockname'] or self.info['blockname'].isspace(): self.info['blockname'] = cli_input("Enter name of block/code (without module name prefix): ") - if not re.match('^[a-zA-Z0-9_]+$', self.info['blockname']): - raise ModToolException('Invalid block name.') + validate_name('block', self.info['blockname']) self.info['fullblockname'] = self.info['modname'] + '_' + self.info['blockname'] fname_grc = self.info['fullblockname'] + '.block.yml' for block in os.scandir('./grc/'): |