From 241326a9a8c20ad7f2bcf651416b836e7778e090 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Thu, 16 Apr 2020 12:25:26 -0500 Subject: Podman V2 birth remote podman v1 and replace with podman v2. Signed-off-by: Brent Baude --- cmd/podman/utils.go | 90 ----------------------------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 cmd/podman/utils.go (limited to 'cmd/podman/utils.go') diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go deleted file mode 100644 index 938a3f41e..000000000 --- a/cmd/podman/utils.go +++ /dev/null @@ -1,90 +0,0 @@ -package main - -import ( - "fmt" - "os" - "reflect" - "runtime/debug" - - "github.com/sirupsen/logrus" - "github.com/spf13/pflag" -) - -// print results from CLI command -func printCmdResults(ok []string, failures map[string]error) error { - for _, id := range ok { - fmt.Println(id) - } - - if len(failures) > 0 { - keys := reflect.ValueOf(failures).MapKeys() - lastKey := keys[len(keys)-1].String() - lastErr := failures[lastKey] - delete(failures, lastKey) - - for _, err := range failures { - outputError(err) - } - return lastErr - } - return nil -} - -// markFlagHiddenForRemoteClient makes the flag not appear as part of the CLI -// on the remote-client -func markFlagHiddenForRemoteClient(flagName string, flags *pflag.FlagSet) { - if remoteclient { - if err := flags.MarkHidden(flagName); err != nil { - debug.PrintStack() - logrus.Errorf("unable to mark %s as hidden in the remote-client", flagName) - } - } -} - -// markFlagHidden is a helper function to log an error if marking -// a flag as hidden happens to fail -func markFlagHidden(flags *pflag.FlagSet, flag string) { - if err := flags.MarkHidden(flag); err != nil { - logrus.Errorf("unable to mark flag '%s' as hidden: %q", flag, err) - } -} - -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) -} - -// Check if a file exists and is not a directory -func checkIfFileExists(name string) bool { - file, err := os.Stat(name) - // All errors return file == nil - if err != nil { - return false - } - return !file.IsDir() -} - -// Check if a file is or is not a directory -func fileIsDir(name string) bool { - file, err := os.Stat(name) - // All errors return file == nil - if err != nil { - return false - } - return file.IsDir() -} -- cgit v1.2.3-54-g00ecf