4 files changed, 43 insertions, 4 deletions

diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index 5058cdfe5..bb6cb5fdd 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/libpod/libpod/define"
+
 	"github.com/containers/common/pkg/config"
 	"github.com/containers/libpod/cmd/podman/common"
 	"github.com/containers/libpod/cmd/podman/registry"
@@ -203,7 +205,7 @@ func pullImage(imageName string) error {
 	}
 	if !br.Value || pullPolicy == config.PullImageAlways {
 		if pullPolicy == config.PullImageNever {
-			return errors.New("unable to find a name and tag match for busybox in repotags: no such image")
+			return errors.Wrapf(define.ErrNoSuchImage, "unable to find a name and tag match for %s in repotags", imageName)
 		}
 		_, pullErr := registry.ImageEngine().Pull(registry.GetContext(), imageName, entities.ImagePullOptions{
 			Authfile:     cliVals.Authfile,
diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go
index 5ef2e23be..f01462447 100644
--- a/cmd/podman/containers/rm.go
+++ b/cmd/podman/containers/rm.go
@@ -128,5 +128,7 @@ func setExitCode(err error) {
 		registry.SetExitCode(1)
 	case cause == define.ErrCtrStateInvalid:
 		registry.SetExitCode(2)
+	case strings.Contains(cause.Error(), define.ErrCtrStateInvalid.Error()):
+		registry.SetExitCode(2)
 	}
 }
diff --git a/cmd/podman/networks/inspect.go b/cmd/podman/networks/inspect.go
index 60cede894..1b2e89909 100644
--- a/cmd/podman/networks/inspect.go
+++ b/cmd/podman/networks/inspect.go
@@ -3,6 +3,10 @@ package network
 import (
 	"encoding/json"
 	"fmt"
+	"html/template"
+	"io"
+	"os"
+	"strings"
 
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/pkg/domain/entities"
@@ -24,12 +28,18 @@ var (
 	}
 )
 
+var (
+	networkInspectOptions entities.NetworkInspectOptions
+)
+
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
 		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: networkinspectCommand,
 		Parent:  networkCmd,
 	})
+	flags := networkinspectCommand.Flags()
+	flags.StringVarP(&networkInspectOptions.Format, "format", "f", "", "Pretty-print network to JSON or using a Go template")
 }
 
 func networkInspect(cmd *cobra.Command, args []string) error {
@@ -41,6 +51,22 @@ func networkInspect(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	fmt.Println(string(b))
+	if strings.ToLower(networkInspectOptions.Format) == "json" || networkInspectOptions.Format == "" {
+		fmt.Println(string(b))
+	} else {
+		var w io.Writer = os.Stdout
+		//There can be more than 1 in the inspect output.
+		format := "{{range . }}" + networkInspectOptions.Format + "{{end}}"
+		tmpl, err := template.New("inspectNetworks").Parse(format)
+		if err != nil {
+			return err
+		}
+		if err := tmpl.Execute(w, responses); err != nil {
+			return err
+		}
+		if flusher, ok := w.(interface{ Flush() error }); ok {
+			return flusher.Flush()
+		}
+	}
 	return nil
 }
diff --git a/cmd/podman/networks/list.go b/cmd/podman/networks/list.go
index 1c0528e5c..24604c055 100644
--- a/cmd/podman/networks/list.go
+++ b/cmd/podman/networks/list.go
@@ -40,8 +40,9 @@ var (
 func networkListFlags(flags *pflag.FlagSet) {
 	// TODO enable filters based on something
 	//flags.StringSliceVarP(&networklistCommand.Filter, "filter", "f",  []string{}, "Pause all running containers")
-	flags.StringVarP(&networkListOptions.Format, "format", "f", "", "Pretty-print containers to JSON or using a Go template")
+	flags.StringVarP(&networkListOptions.Format, "format", "f", "", "Pretty-print networks to JSON or using a Go template")
 	flags.BoolVarP(&networkListOptions.Quiet, "quiet", "q", false, "display only names")
+	flags.StringVarP(&networkListOptions.Filter, "filter", "", "", "Provide filter values (e.g. 'name=podman')")
 }
 
 func init() {
@@ -59,6 +60,14 @@ func networkList(cmd *cobra.Command, args []string) error {
 		nlprs []NetworkListPrintReports
 	)
 
+	// validate the filter pattern.
+	if len(networkListOptions.Filter) > 0 {
+		tokens := strings.Split(networkListOptions.Filter, "=")
+		if len(tokens) != 2 {
+			return fmt.Errorf("invalid filter syntax : %s", networkListOptions.Filter)
+		}
+	}
+
 	responses, err := registry.ContainerEngine().NetworkList(registry.Context(), networkListOptions)
 	if err != nil {
 		return err
@@ -69,7 +78,7 @@ func networkList(cmd *cobra.Command, args []string) error {
 		return quietOut(responses)
 	}
 
-	if networkListOptions.Format == "json" {
+	if strings.ToLower(networkListOptions.Format) == "json" {
 		return jsonOut(responses)
 	}