diff options
author | zhangguanzhang <zhangguanzhang@qq.com> | 2021-04-14 12:55:45 +0800 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2021-04-16 11:13:21 -0400 |
commit | 6a47afa79c04ddc6153e451df9de86317713fdfb (patch) | |
tree | 97436ba0b57d236181f4d35b9ee880dbe737871d | |
parent | c28695b9253569683c6e0e5f25a04c0701100b0a (diff) | |
download | podman-6a47afa79c04ddc6153e451df9de86317713fdfb.tar.gz podman-6a47afa79c04ddc6153e451df9de86317713fdfb.tar.bz2 podman-6a47afa79c04ddc6153e451df9de86317713fdfb.zip |
Fixes invalid expression in save command
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
-rw-r--r-- | cmd/podman/images/save.go | 2 | ||||
-rw-r--r-- | test/e2e/save_test.go | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go index 6c03fc3c6..f1f7e8b2e 100644 --- a/cmd/podman/images/save.go +++ b/cmd/podman/images/save.go @@ -102,7 +102,7 @@ func save(cmd *cobra.Command, args []string) (finalErr error) { tags []string succeeded = false ) - if cmd.Flag("compress").Changed && (saveOpts.Format != define.OCIManifestDir && saveOpts.Format != define.V2s2ManifestDir && saveOpts.Format == "") { + if cmd.Flag("compress").Changed && (saveOpts.Format != define.OCIManifestDir && saveOpts.Format != define.V2s2ManifestDir) { return errors.Errorf("--compress can only be set when --format is either 'oci-dir' or 'docker-dir'") } if len(saveOpts.Output) == 0 { diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 5ddd5efc8..42ee7440b 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -111,6 +111,24 @@ var _ = Describe("Podman save", func() { Expect(save.ExitCode()).To(Equal(0)) }) + It("podman save to directory with --compress but not use docker-dir and oci-dir", func() { + if rootless.IsRootless() && podmanTest.RemoteTest { + Skip("Requires a fix in containers image for chown/lchown") + } + outdir := filepath.Join(podmanTest.TempDir, "save") + + save := podmanTest.Podman([]string{"save", "--compress", "--format", "docker-archive", "-o", outdir, ALPINE}) + save.WaitWithDefaultTimeout() + // should not be 0 + Expect(save.ExitCode()).ToNot(Equal(0)) + + save = podmanTest.Podman([]string{"save", "--compress", "--format", "oci-archive", "-o", outdir, ALPINE}) + save.WaitWithDefaultTimeout() + // should not be 0 + Expect(save.ExitCode()).ToNot(Equal(0)) + + }) + It("podman save bad filename", func() { outdir := filepath.Join(podmanTest.TempDir, "save:colon") |