aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangguanzhang <zhangguanzhang@qq.com>2021-04-14 12:55:45 +0800
committerzhangguanzhang <zhangguanzhang@qq.com>2021-04-14 17:32:48 +0800
commit6bec101041abba77329a7e04a329ab9792f7e1aa (patch)
tree03a17ba843ad2a52fcb76dc36a0a52ef79232b0b
parent4a22d6117aeb2f2b9fa120328bba857f7fd54d47 (diff)
downloadpodman-6bec101041abba77329a7e04a329ab9792f7e1aa.tar.gz
podman-6bec101041abba77329a7e04a329ab9792f7e1aa.tar.bz2
podman-6bec101041abba77329a7e04a329ab9792f7e1aa.zip
Fixes invalid expression in save command
Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
-rw-r--r--cmd/podman/images/save.go2
-rw-r--r--test/e2e/save_test.go18
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")