Use terminal detach keys sequence specified in the config file #4651
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: marcov, mheon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Lint seems to be complaining about a bit of excess whitespace? |
03b540a to
02496bf
Compare
mheon
reviewed
Dec 5, 2019
pkg/adapter/containers.go
Outdated
| @@ -367,6 +367,23 @@ func (r *LocalRuntime) CreateContainer(ctx context.Context, c *cliconfig.CreateV | |||
| return ctr.ID(), nil | |||
| } | |||
|
|
|||
| // Select the detach keys to use from user input flag, config file, or default value | |||
| func (r *LocalRuntime) selectDetachKeys(flagValue string) (error, string) { | |||
There was a problem hiding this comment.
Should probably flip this to (string, error)
cmd/podman/exec.go
Outdated
| @@ -36,6 +36,9 @@ func init() { | |||
| flags := execCommand.Flags() | |||
| flags.SetInterspersed(false) | |||
| flags.StringVar(&execCommand.DetachKeys, "detach-keys", define.DefaultDetachKeys, "Select the key sequence for detaching a container. Format is a single character [a-Z] or ctrl-<value> where <value> is one of: a-z, @, ^, [, , or _") | |||
| // Clear the default, the value specified in the config file should have the | |||
| //priority | |||
There was a problem hiding this comment.
Missing a space between // and priority
|
Other than @mheon's comments, LGTM |
Fixes: containers#4556 Signed-off-by: Marco Vedovati <mv@sba.lat>
|
Updated, thank you! |
|
/lgtm |
|
Thanks @marcov |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #4556
Signed-off-by: Marco Vedovati mv@sba.lat