4 files changed, 14 insertions, 12 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
index 642da0c83..4c563ed27 100644
--- a/cmd/podman/images/build.go
+++ b/cmd/podman/images/build.go
@@ -131,7 +131,7 @@ func buildFlags(cmd *cobra.Command) {
 	// --pull flag
 	flag := budFlags.Lookup("pull")
 	if err := flag.Value.Set("true"); err != nil {
-		logrus.Errorf("unable to set --pull to true: %v", err)
+		logrus.Errorf("Unable to set --pull to true: %v", err)
 	}
 	flag.DefValue = "true"
 	flag.Usage = "Always attempt to pull the image (errors are fatal)"
@@ -148,13 +148,13 @@ func buildFlags(cmd *cobra.Command) {
 	useLayersVal := useLayers()
 	buildOpts.Layers = useLayersVal == "true"
 	if err := flag.Value.Set(useLayersVal); err != nil {
-		logrus.Errorf("unable to set --layers to %v: %v", useLayersVal, err)
+		logrus.Errorf("Unable to set --layers to %v: %v", useLayersVal, err)
 	}
 	flag.DefValue = useLayersVal
 	// --force-rm flag
 	flag = layerFlags.Lookup("force-rm")
 	if err := flag.Value.Set("true"); err != nil {
-		logrus.Errorf("unable to set --force-rm to true: %v", err)
+		logrus.Errorf("Unable to set --force-rm to true: %v", err)
 	}
 	flag.DefValue = "true"
 	flags.AddFlagSet(&layerFlags)
@@ -162,7 +162,7 @@ func buildFlags(cmd *cobra.Command) {
 	// FromAndBud flags
 	fromAndBudFlags, err := buildahCLI.GetFromAndBudFlags(&buildOpts.FromAndBudResults, &buildOpts.UserNSResults, &buildOpts.NameSpaceResults)
 	if err != nil {
-		logrus.Errorf("error setting up build flags: %v", err)
+		logrus.Errorf("Setting up build flags: %v", err)
 		os.Exit(1)
 	}
 	// --http-proxy flag
@@ -171,7 +171,7 @@ func buildFlags(cmd *cobra.Command) {
 		flag = fromAndBudFlags.Lookup("http-proxy")
 		buildOpts.HTTPProxy = false
 		if err := flag.Value.Set("false"); err != nil {
-			logrus.Errorf("unable to set --https-proxy to %v: %v", false, err)
+			logrus.Errorf("Unable to set --https-proxy to %v: %v", false, err)
 		}
 		flag.DefValue = "false"
 	}
@@ -184,7 +184,7 @@ func buildFlags(cmd *cobra.Command) {
 		flag = flags.Lookup("isolation")
 		buildOpts.Isolation = buildahDefine.OCI
 		if err := flag.Value.Set(buildahDefine.OCI); err != nil {
-			logrus.Errorf("unable to set --isolation to %v: %v", buildahDefine.OCI, err)
+			logrus.Errorf("Unable to set --isolation to %v: %v", buildahDefine.OCI, err)
 		}
 		flag.DefValue = buildahDefine.OCI
 		_ = flags.MarkHidden("disable-content-trust")
@@ -228,7 +228,7 @@ func build(cmd *cobra.Command, args []string) error {
 			// Delete it later.
 			defer func() {
 				if err = os.RemoveAll(tempDir); err != nil {
-					logrus.Errorf("error removing temporary directory %q: %v", contextDir, err)
+					logrus.Errorf("Removing temporary directory %q: %v", contextDir, err)
 				}
 			}()
 			contextDir = filepath.Join(tempDir, subDir)
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index 35c173a60..dd8cf8056 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -17,9 +17,9 @@ var (
 		Long:              `Displays the low-level information of an image identified by name or ID.`,
 		RunE:              inspectExec,
 		ValidArgsFunction: common.AutocompleteImages,
-		Example: `podman inspect alpine
-  podman inspect --format "imageId: {{.Id}} size: {{.Size}}" alpine
-  podman inspect --format "image: {{.ImageName}} driver: {{.Driver}}" myctr`,
+		Example: `podman image inspect alpine
+  podman image inspect --format "imageId: {{.Id}} size: {{.Size}}" alpine
+  podman image inspect --format "image: {{.ImageName}} driver: {{.Driver}}" myctr`,
 	}
 	inspectOpts *entities.InspectOptions
 )
diff --git a/cmd/podman/images/save.go b/cmd/podman/images/save.go
index 19dadb2ad..4f45cb912 100644
--- a/cmd/podman/images/save.go
+++ b/cmd/podman/images/save.go
@@ -84,6 +84,8 @@ func saveFlags(cmd *cobra.Command) {
 
 	flags.BoolVar(&saveOpts.Compress, "compress", false, "Compress tarball image layers when saving to a directory using the 'dir' transport. (default is same compression type as source)")
 
+	flags.BoolVar(&saveOpts.OciAcceptUncompressedLayers, "uncompressed", false, "Accept uncompressed layers when copying OCI images")
+
 	formatFlagName := "format"
 	flags.StringVar(&saveOpts.Format, formatFlagName, define.V2s2Archive, "Save image to oci-archive, oci-dir (directory with oci manifest type), docker-archive, docker-dir (directory with v2s2 manifest type)")
 	_ = cmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteImageSaveFormat)
diff --git a/cmd/podman/images/utils_linux.go b/cmd/podman/images/utils_linux.go
index 5521abab4..f7c159415 100644
--- a/cmd/podman/images/utils_linux.go
+++ b/cmd/podman/images/utils_linux.go
@@ -24,7 +24,7 @@ func setupPipe() (string, func() <-chan error, error) {
 	err = unix.Mkfifo(pipePath, 0600)
 	if err != nil {
 		if e := os.RemoveAll(pipeDir); e != nil {
-			logrus.Errorf("error removing named pipe: %q", e)
+			logrus.Errorf("Removing named pipe: %q", e)
 		}
 		return "", nil, errors.Wrapf(err, "error creating named pipe")
 	}
@@ -40,7 +40,7 @@ func setupPipe() (string, func() <-chan error, error) {
 	}()
 	return pipePath, func() <-chan error {
 		if e := os.RemoveAll(pipeDir); e != nil {
-			logrus.Errorf("error removing named pipe: %q", e)
+			logrus.Errorf("Removing named pipe: %q", e)
 		}
 		return errc
 	}, nil