Merge pull request #10021 from zhangguanzhang/invalid-save-expression

Fix invalid expression in save command
containers · Apr 16, 2021 · 4c88035 · 4c88035
2 parents b82ae19 + 6bec101
commit 4c88035
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git 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
@@ -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")