mmgen/mmgen-wallet
1
Fork 0
Code Releases 28 Wiki Activity

wallet: ‘requested on command line’ -> ‘user-configured’

Browse source
This commit is contained in:
The MMGen Project 2024-09-20 09:36:06 +00:00
commit ab1fbb8f5d
Signed by: mmgen
GPG key ID: 3F8B1861E32B7DA2
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/pylint.yaml vendored
View file

@ -55,7 +55,7 @@ jobs:
env:
PYTHONPATH: .
run: |
pylint --errors-only mmgen
pylint --errors-only test
pylint --errors-only examples
pylint --errors-only --disable=relative-beyond-top-level test/cmdtest_py_d
pylint --errors-only --jobs=0 mmgen
pylint --errors-only --jobs=0 test
pylint --errors-only --jobs=0 examples
pylint --errors-only --jobs=0 --disable=relative-beyond-top-level test/cmdtest_py_d

2
mmgen/data/version
View file

@ -1 +1 @@
15.0.dev7
15.0.dev8

4
mmgen/wallet/enc.py
View file

@ -49,7 +49,7 @@ class wallet(wallet):
self.cfg._util.qmsg(f'Reusing hash preset {hp!r} at user request')
elif self.cfg.hash_preset:
hp = self.cfg.hash_preset
self.cfg._util.qmsg(f'Using hash preset {hp!r} requested on command line')
self.cfg._util.qmsg(f'Using user-configured hash preset {hp!r}')
else: # Prompt, using old value as default
hp = self._get_hash_preset_from_user( old_preset=old_hp, add_desc=add_desc )
if (not self.cfg.keep_hash_preset) and self.op == 'pwchg_new':
@ -57,7 +57,7 @@ class wallet(wallet):
'unchanged' if hp == old_hp else f'changed to {hp!r}'))
elif self.cfg.hash_preset:
hp = self.cfg.hash_preset
self.cfg._util.qmsg(f'Using hash preset {hp!r} requested on command line')
self.cfg._util.qmsg(f'Using user-configured hash preset {hp!r}')
else:
hp = self._get_hash_preset_from_user(
old_preset = gc.dfl_hash_preset,

4
mmgen/wallet/mmgen.py
View file

@ -58,14 +58,14 @@ class wallet(wallet):
self.cfg._util.qmsg('Reusing label {} at user request'.format( lbl.hl2(encl='‘’') ))
elif self.label:
lbl = self.label
self.cfg._util.qmsg('Using label {} requested on command line'.format( lbl.hl2(encl='‘’') ))
self.cfg._util.qmsg('Using user-configured label {}'.format(lbl.hl2(encl='‘’')))
else: # Prompt, using old value as default
lbl = self._get_label_from_user(old_lbl)
if (not self.cfg.keep_label) and self.op == 'pwchg_new':
self.cfg._util.qmsg('Label {}'.format( 'unchanged' if lbl == old_lbl else f'changed to {lbl!r}' ))
elif self.label:
lbl = self.label
self.cfg._util.qmsg('Using label {} requested on command line'.format( lbl.hl2(encl='‘’') ))
self.cfg._util.qmsg('Using user-configured label {}'.format(lbl.hl2(encl='‘’')))
else:
lbl = self._get_label_from_user()
self.ssdata.label = lbl