diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-27 12:52:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 12:52:51 +0200 |
| commit | 71f7150490c622708ade8348dcd85fd428c5f116 (patch) | |
| tree | b344a41eaeac8bc1650f90ba337739458bce70c5 | |
| parent | 11e8e655683535999f4d7f2b79859a8ec537b765 (diff) | |
| parent | 8a45703f79cc1c54e7a4b908111a1becf907873a (diff) | |
| download | podman-71f7150490c622708ade8348dcd85fd428c5f116.tar.gz podman-71f7150490c622708ade8348dcd85fd428c5f116.tar.bz2 podman-71f7150490c622708ade8348dcd85fd428c5f116.zip | |
Merge pull request #7083 from Luap99/fix-template-escaping
replace the html/template package with text/template
| -rw-r--r-- | cmd/podman/networks/inspect.go | 2 | ||||
| -rw-r--r-- | cmd/podman/networks/list.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/df.go | 2 | ||||
| -rw-r--r-- | cmd/podman/system/events.go | 2 | ||||
| -rw-r--r-- | cmd/podman/volumes/inspect.go | 2 | ||||
| -rw-r--r-- | cmd/podman/volumes/list.go | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go index bf2c7a5e0..bfbb09cb8 100644 --- a/cmd/podman/networks/inspect.go +++ b/cmd/podman/networks/inspect.go @@ -3,10 +3,10 @@ package network import ( "encoding/json" "fmt" - "html/template" "io" "os" "strings" + "text/template" "github.com/containers/libpod/v2/cmd/podman/registry" "github.com/containers/libpod/v2/pkg/domain/entities" diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go index ad2ee98b1..105bd25c6 100644 --- a/cmd/podman/networks/list.go +++ b/cmd/podman/networks/list.go @@ -3,10 +3,10 @@ package network import ( "encoding/json" "fmt" - "html/template" "os" "strings" "text/tabwriter" + "text/template" "github.com/containers/libpod/v2/cmd/podman/registry" "github.com/containers/libpod/v2/cmd/podman/validate" diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go index c2308f0cc..a242c4f66 100644 --- a/cmd/podman/system/df.go +++ b/cmd/podman/system/df.go @@ -2,11 +2,11 @@ package system import ( "fmt" - "html/template" "io" "os" "strings" "text/tabwriter" + "text/template" "time" "github.com/containers/libpod/v2/cmd/podman/registry" diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go index 246611c1a..0a46a4042 100644 --- a/cmd/podman/system/events.go +++ b/cmd/podman/system/events.go @@ -3,9 +3,9 @@ package system import ( "bufio" "context" - "html/template" "os" "strings" + "text/template" "github.com/containers/buildah/pkg/formats" "github.com/containers/libpod/v2/cmd/podman/registry" diff --git a/cmd/podman/volumes/inspect.go b/cmd/podman/volumes/inspect.go index 9a8f4049b..235137fc7 100644 --- a/cmd/podman/volumes/inspect.go +++ b/cmd/podman/volumes/inspect.go @@ -2,9 +2,9 @@ package volumes import ( "fmt" - "html/template" "os" "strings" + "text/template" "github.com/containers/buildah/pkg/formats" "github.com/containers/libpod/v2/cmd/podman/registry" diff --git a/cmd/podman/volumes/list.go b/cmd/podman/volumes/list.go index 9e3a8f77b..804b9f319 100644 --- a/cmd/podman/volumes/list.go +++ b/cmd/podman/volumes/list.go @@ -3,11 +3,11 @@ package volumes import ( "context" "fmt" - "html/template" "io" "os" "strings" "text/tabwriter" + "text/template" "github.com/containers/libpod/v2/cmd/podman/registry" "github.com/containers/libpod/v2/cmd/podman/validate" |