derivepassphrase.git

@@ -122,6 +122,8 @@ The <var>SERVICE</var> is mandatory for `--notes` and `--delete`, optional for `

 The storage management options deal with importing and exporting the stored settings.

 They are mutually exclusive; you may only specify one of them.

+The <var>SERVICE</var> argument is forbidden.

+

 Using `-` as <var>PATH</var> for standard input/standard output is supported.

 <b>-e</b> <var>PATH</var>, <b>-</b><b>-export</b> <var>PATH</var>

@@ -41,14 +41,7 @@

 .Ar SERVICE

 .

 .Nm derivepassphrase vault

-.Bro

-.Fl \-delete

-.Ar SERVICE

-|

-.Fl \-delete\-globals

-|

-.Fl \-clear

-.Brc

+.Brq Fl \-delete Ar SERVICE | Fl \-delete\-globals | Fl \-clear

 .

 .Nm derivepassphrase vault

 .Op Fl \-export\-as Brq Li json | sh

@@ -321,6 +314,12 @@ Delete all stored settings.

 The storage management options deal with importing and exporting the stored

 settings.

 They are mutually exclusive; you may only specify one of them.

+The

+.Ar SERVICE

+argument is forbidden.

+.

+.Pp

+.

 Using

 .Li \-

 as

@@ -636,15 +636,11 @@ def check_for_misleading_passphrase(

         phrase = value['phrase']

         if not unicodedata.is_normalized(form, phrase):

             logger.warning(

-                (

-                    'The %s passphrase is not %s-normalized.  Its '

-                    'serialization as a byte string may not be what you '

-                    'expect it to be, even if it *displays* correctly.  '

-                    'Please make sure to double-check any derived '

-                    'passphrases for unexpected results.'

+                _msg.TranslatedString(

+                    _msg.WarnMsgTemplate.PASSPHRASE_NOT_NORMALIZED,

+                    key=formatted_key,

+                    form=form,

                 ),

-                formatted_key,

-                form,

                 stacklevel=2,

                 extra={'color': ctx.color if ctx is not None else None},

             )

@@ -1791,8 +1791,9 @@ class WarnMsgTemplate(enum.Enum):

     )(

         'Warning message',

         'An empty {service_metavar!s} is not supported by vault(1).  '

-        'For compatibility, this will be treated as if SERVICE was not '

-        'supplied, i.e., it will error out, or operate on global settings.',

+        'For compatibility, this will be treated as if '

+        '{service_metavar!s} was not supplied, i.e., it will error out, '

+        'or operate on global settings.',

         flags='python-brace-format',

     )

     """"""

@@ -2031,7 +2032,7 @@ class ErrMsgTemplate(enum.Enum):

     )(

         'Error message',

         "Cannot understand the SSH agent's response because it "

-        'violates the communications protocol.',

+        'violates the communication protocol.',

     )

     """"""

     CANNOT_UPDATE_SETTINGS_NO_SETTINGS = commented(

@@ -3441,7 +3441,7 @@ class TestCLI:

             )

         result = tests.ReadableResult.parse(result_)

         assert result.error_exit(

-            error='violates the communications protocol.'

+            error='violates the communication protocol.'

         ), 'expected error exit and known error message'

     def test_225i_store_config_fail_manual_ssh_agent_refuses(

@@ -4583,7 +4583,7 @@ Boo.

             with monkeypatch.context() as mp:

                 mp.setattr(ssh_agent.SSHAgentClient, 'sign', fail_runtime)

                 with pytest.raises(

-                    ErrCallback, match='violates the communications protocol'

+                    ErrCallback, match='violates the communication protocol'

                 ):

                     cli_helpers.key_to_phrase(loaded_key, error_callback=err)