Merge pull request #5852 from baude/v1prune

Podman V2 birth

2 files changed, 40 insertions, 0 deletions

diff --git a/cmd/podman/utils/alias.go b/cmd/podman/utils/alias.go
new file mode 100644
index 000000000..54b3c5e89
--- /dev/null
+++ b/cmd/podman/utils/alias.go
@@ -0,0 +1,24 @@
+package utils
+
+import "github.com/spf13/pflag"
+
+// AliasFlags is a function to handle backwards compatability with old flags
+func AliasFlags(f *pflag.FlagSet, name string) pflag.NormalizedName {
+	switch name {
+	case "healthcheck-command":
+		name = "health-cmd"
+	case "healthcheck-interval":
+		name = "health-interval"
+	case "healthcheck-retries":
+		name = "health-retries"
+	case "healthcheck-start-period":
+		name = "health-start-period"
+	case "healthcheck-timeout":
+		name = "health-timeout"
+	case "net":
+		name = "network"
+	case "timeout":
+		name = "time"
+	}
+	return pflag.NormalizedName(name)
+}
diff --git a/cmd/podman/utils/error.go b/cmd/podman/utils/error.go
new file mode 100644
index 000000000..3464f0779
--- /dev/null
+++ b/cmd/podman/utils/error.go
@@ -0,0 +1,16 @@
+package utils
+
+import "fmt"
+
+type OutputErrors []error
+
+func (o OutputErrors) PrintErrors() (lastError error) {
+	if len(o) == 0 {
+		return
+	}
+	lastError = o[len(o)-1]
+	for e := 0; e < len(o)-1; e++ {
+		fmt.Println(o[e])
+	}
+	return
+}