cmd: Code improvement

Signed-off-by: Zhou Hao <[email protected]> Closes: #843 Approved by: rhatdan
containers · Jul 2, 2018 · 5c11c34 · 5c11c34
1 parent 5cd9be6
commit 5c11c34
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/cmd/buildah/mount.go b/cmd/buildah/mount.go
@@ -6,8 +6,6 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
-	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -49,17 +47,17 @@ func mountCmd(c *cli.Context) error {
 			builder, err := openBuilder(getContext(), store, name)
 			if err != nil {
 				if lastError != nil {
-					logrus.Error(lastError)
+					fmt.Fprintln(os.Stderr, lastError)
 				}
-				lastError = util.WriteError(os.Stderr, errors.Wrapf(err, "error reading build container %q", name), lastError)
+				lastError = errors.Wrapf(err, "error reading build container %q", name)
 				continue
 			}
 			mountPoint, err := builder.Mount(builder.MountLabel)
 			if err != nil {
 				if lastError != nil {
-					logrus.Error(lastError)
+					fmt.Fprintln(os.Stderr, lastError)
 				}
-				lastError = util.WriteError(os.Stderr, errors.Wrapf(err, "error mounting %q container %q", name, builder.Container), lastError)
+				lastError = errors.Wrapf(err, "error mounting %q container %q", name, builder.Container)
 				continue
 			}
 			if len(args) > 1 {

diff --git a/cmd/buildah/umount.go b/cmd/buildah/umount.go
@@ -21,7 +21,7 @@ var (
 		Usage:          "Unmounts the root file system on the specified working containers",
 		Description:    "Unmounts the root file system on the specified working containers",
 		Action:         umountCmd,
-		ArgsUsage:      "CONTAINER-NAME-OR-ID [...]",
+		ArgsUsage:      "[CONTAINER-NAME-OR-ID [...]]",
 		Flags:          umountFlags,
 		SkipArgReorder: true,
 	}

diff --git a/docs/buildah-umount.md b/docs/buildah-umount.md
@@ -4,7 +4,7 @@
 buildah\-umount - Unmount the root file system on the specified working containers.
 
 ## SYNOPSIS
-**buildah umount** *container* ...
+**buildah umount** [*options*]  [*container* ...]
 
 ## DESCRIPTION
 Unmounts the root file system on the specified working containers.