summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorValentin Rothberg <vrothberg@redhat.com>2022-04-28 09:40:46 +0200
committerValentin Rothberg <vrothberg@redhat.com>2022-04-28 09:40:46 +0200
commitea1fcd7bc71f391faef0cd2ca7547a17a597e9e2 (patch)
treecaede87e2dec18007f95d14a4f396fd6946da573 /cmd/podman
parent78c66fb005b75afc4f69564dd40ba16af92cfa6a (diff)
downloadpodman-ea1fcd7bc71f391faef0cd2ca7547a17a597e9e2.tar.gz
podman-ea1fcd7bc71f391faef0cd2ca7547a17a597e9e2.tar.bz2
podman-ea1fcd7bc71f391faef0cd2ca7547a17a597e9e2.zip
podman search: truncate by default
Truncate by default to avoid long descriptions from rendering the output unreadable. [NO NEW TESTS NEEDED] Fixes: #14044 Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/images/search.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/images/search.go b/cmd/podman/images/search.go
index aa11cf254..7f202cb6a 100644
--- a/cmd/podman/images/search.go
+++ b/cmd/podman/images/search.go
@@ -23,6 +23,7 @@ type searchOptionsWrapper struct {
Compatible bool // Docker compat
TLSVerifyCLI bool // Used to convert to an optional bool later
Format string // For go templating
+ NoTrunc bool
}
// listEntryTag is a utility structure used for json serialization.
@@ -92,7 +93,7 @@ func searchFlags(cmd *cobra.Command) {
flags.IntVar(&searchOptions.Limit, limitFlagName, 0, "Limit the number of results")
_ = cmd.RegisterFlagCompletionFunc(limitFlagName, completion.AutocompleteNone)
- flags.Bool("no-trunc", true, "Do not truncate the output. Default: true")
+ flags.BoolVar(&searchOptions.NoTrunc, "no-trunc", false, "Do not truncate the output")
flags.BoolVar(&searchOptions.Compatible, "compatible", false, "List stars, official and automated columns (Docker compatibility)")
authfileFlagName := "authfile"
@@ -139,11 +140,10 @@ func imageSearch(cmd *cobra.Command, args []string) error {
return nil
}
- noTrunc, _ := cmd.Flags().GetBool("no-trunc")
isJSON := report.IsJSON(searchOptions.Format)
for i, element := range searchReport {
d := strings.ReplaceAll(element.Description, "\n", " ")
- if len(d) > 44 && !(noTrunc || isJSON) {
+ if len(d) > 44 && !(searchOptions.NoTrunc || isJSON) {
d = strings.TrimSpace(d[:44]) + "..."
}
searchReport[i].Description = d