diff options
author | Brent Baude <bbaude@redhat.com> | 2022-08-24 09:28:39 -0500 |
---|---|---|
committer | Brent Baude <bbaude@redhat.com> | 2022-08-24 10:31:42 -0500 |
commit | 19a617eaab02c27b0975333bb2c1db0998ce4d59 (patch) | |
tree | 4eaa0483acadcf8fcee8c154b2b5bf5bdbbe5023 /cmd/podman | |
parent | 34d516840df73787d2359037e4a2ab51849e59eb (diff) | |
download | podman-19a617eaab02c27b0975333bb2c1db0998ce4d59.tar.gz podman-19a617eaab02c27b0975333bb2c1db0998ce4d59.tar.bz2 podman-19a617eaab02c27b0975333bb2c1db0998ce4d59.zip |
Allow colons in windows file paths
the `podman save` command was failing on windows due to the use of a
colon between the drive letter and first directory. the check was
intended for Linux and not windows.
Fixes #15247
[NO NEW TESTS NEEDED]
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/parse/net.go | 9 | ||||
-rw-r--r-- | cmd/podman/parse/parse.go | 18 | ||||
-rw-r--r-- | cmd/podman/parse/parse_windows.go | 5 |
3 files changed, 23 insertions, 9 deletions
diff --git a/cmd/podman/parse/net.go b/cmd/podman/parse/net.go index 9228c7127..a5c7a0d95 100644 --- a/cmd/podman/parse/net.go +++ b/cmd/podman/parse/net.go @@ -151,15 +151,6 @@ func parseEnvOrLabelFile(envOrLabel map[string]string, filename, configType stri return scanner.Err() } -// ValidateFileName returns an error if filename contains ":" -// as it is currently not supported -func ValidateFileName(filename string) error { - if strings.Contains(filename, ":") { - return fmt.Errorf("invalid filename (should not contain ':') %q", filename) - } - return nil -} - // ValidURL checks a string urlStr is a url or not func ValidURL(urlStr string) error { url, err := url.ParseRequestURI(urlStr) diff --git a/cmd/podman/parse/parse.go b/cmd/podman/parse/parse.go new file mode 100644 index 000000000..47db066d3 --- /dev/null +++ b/cmd/podman/parse/parse.go @@ -0,0 +1,18 @@ +//go:build !windows +// +build !windows + +package parse + +import ( + "fmt" + "strings" +) + +// ValidateFileName returns an error if filename contains ":" +// as it is currently not supported +func ValidateFileName(filename string) error { + if strings.Contains(filename, ":") { + return fmt.Errorf("invalid filename (should not contain ':') %q", filename) + } + return nil +} diff --git a/cmd/podman/parse/parse_windows.go b/cmd/podman/parse/parse_windows.go new file mode 100644 index 000000000..794f4216d --- /dev/null +++ b/cmd/podman/parse/parse_windows.go @@ -0,0 +1,5 @@ +package parse + +func ValidateFileName(filename string) error { + return nil +} |