diff options
| author | mormj <mormjb@gmail.com> | 2020-10-16 07:02:55 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2020-10-20 08:39:44 -0400 |
| commit | 28eb0c65f1ebb2004c049749eeeef1d9ed042b7e (patch) | |
| tree | 9230f09cb530f9c5fa03709890602b44a79e837f /gr-utils/modtool/cli/add.py | |
| parent | 31c9168cf4dfc2f627bc6356121e099134fc4257 (diff) | |
modtool: update of cli block name checking
Diffstat (limited to 'gr-utils/modtool/cli/add.py')
| -rw-r--r-- | gr-utils/modtool/cli/add.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-utils/modtool/cli/add.py b/gr-utils/modtool/cli/add.py index feb9332611..89c7db07a3 100644 --- a/gr-utils/modtool/cli/add.py +++ b/gr-utils/modtool/cli/add.py @@ -53,7 +53,6 @@ def cli(**kwargs): raise ModToolException('Missing or skipping relevant subdir.') get_blockname(self) click.secho("Block/code identifier: " + self.info['blockname'], fg='green') - self.info['fullblockname'] = self.info['modname'] + '_' + self.info['blockname'] if not self.license_file: get_copyrightholder(self) self.info['license'] = self.setup_choose_license() @@ -93,11 +92,12 @@ def get_blockname(self): 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.') + self.info['fullblockname'] = self.info['modname'] + '_' + self.info['blockname'] + fname_grc = self.info['fullblockname'] + '.block.yml' for block in os.scandir('./grc/'): if block.is_file(): s = block.name - present_block = self.info['modname'] + "_" + self.info['blockname'] + ".block.yml" - if s == present_block: + if s == fname_grc: raise ModToolException('Block Already Present.') def get_copyrightholder(self): |