4 files changed, 8 insertions, 14 deletions
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 604e8d31c..b4d249c66 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
-	"github.com/containers/libpod/pkg/util"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -65,17 +64,6 @@ func commitCmd(c *cliconfig.CommitValues) error {
 	if len(args) > 1 {
 		reference = args[1]
 	}
-	if c.Flag("change").Changed {
-		for _, change := range c.Change {
-			splitChange := strings.Split(strings.ToUpper(change), "=")
-			if len(splitChange) == 1 {
-				splitChange = strings.Split(strings.ToUpper(change), " ")
-			}
-			if !util.StringInSlice(splitChange[0], ChangeCmds) {
-				return errors.Errorf("invalid syntax for --change: %s", change)
-			}
-		}
-	}
 
 	iid, err := runtime.Commit(getContext(), c, container, reference)
 	if err != nil {
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
index 1cbb3f45e..b5957d7fe 100644
--- a/cmd/podman/pull.go
+++ b/cmd/podman/pull.go
@@ -101,6 +101,7 @@ func pullCmd(c *cliconfig.PullValues) (retError error) {
 		}
 	}
 
+	// FIXME: that's a bug. What if we pass "localhost:5000/no-tag" ?
 	arr := strings.SplitN(args[0], ":", 2)
 	if len(arr) == 2 {
 		if c.Bool("all-tags") {
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index 9459247ed..ff3846e70 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -640,6 +640,11 @@ func GetNamespaces(pid int) *Namespace {
 	}
 }
 
+// GetNamespaceInfo is an exported wrapper for getNamespaceInfo
+func GetNamespaceInfo(path string) (string, error) {
+	return getNamespaceInfo(path)
+}
+
 func getNamespaceInfo(path string) (string, error) {
 	val, err := os.Readlink(path)
 	if err != nil {
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 010c80373..3062b0ca3 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -109,11 +109,11 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 		}
 
 		if overrideOS == "" && imageData.Os != goruntime.GOOS {
-			return nil, nil, errors.Errorf("incompatible image OS %q on %q host", imageData.Os, goruntime.GOOS)
+			logrus.Infof("Using %q (OS) image on %q host", imageData.Os, goruntime.GOOS)
 		}
 
 		if overrideArch == "" && imageData.Architecture != goruntime.GOARCH {
-			return nil, nil, errors.Errorf("incompatible image architecture %q on %q host", imageData.Architecture, goruntime.GOARCH)
+			logrus.Infof("Using %q (architecture) on %q host", imageData.Architecture, goruntime.GOARCH)
 		}
 
 		names := newImage.Names()