diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-25 17:49:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 17:49:08 +0200 |
| commit | 1b95ed9a71faff063edef34bc2ba5d89eab66a2b (patch) | |
| tree | dc3cb0555500fafef28d0385f5810de6bbbc2055 /cmd/podman/import.go | |
| parent | 7c9095ea1de363f8d76ae246575062755ac9398e (diff) | |
| parent | a328e873c67af2cc469f57b3dc34b46a0f799558 (diff) | |
| download | podman-1b95ed9a71faff063edef34bc2ba5d89eab66a2b.tar.gz podman-1b95ed9a71faff063edef34bc2ba5d89eab66a2b.tar.bz2 podman-1b95ed9a71faff063edef34bc2ba5d89eab66a2b.zip | |
Merge pull request #3622 from QiWang19/checkurl
fix import not ignoring url path
Diffstat (limited to 'cmd/podman/import.go')
| -rw-r--r-- | cmd/podman/import.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd/podman/import.go b/cmd/podman/import.go index 70ea167cb..d49792f27 100644 --- a/cmd/podman/import.go +++ b/cmd/podman/import.go @@ -6,6 +6,7 @@ import ( "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/pkg/adapter" + multierror "github.com/hashicorp/go-multierror" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -69,8 +70,11 @@ func importCmd(c *cliconfig.ImportValues) error { return errors.Errorf("too many arguments. Usage TARBALL [REFERENCE]") } - if err := parse.ValidateFileName(source); err != nil { - return err + errFileName := parse.ValidateFileName(source) + errURL := parse.ValidURL(source) + + if errFileName != nil && errURL != nil { + return multierror.Append(errFileName, errURL) } quiet := c.Quiet |