From a10366adefe9ff7fe97a21b5bdb615ede88a2e71 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 10 Mar 2020 10:35:31 -0400 Subject: [PATCH] Drop depracated warnings to debug Currently podman ships with libpod.conf, We need to remove the noice for these warnings from buildah for the time being. We can fix this once podman is shipping without libpod.conf. Signed-off-by: Daniel J Walsh --- common/pkg/config/libpodConfig.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/common/pkg/config/libpodConfig.go b/common/pkg/config/libpodConfig.go index 0d171fa33e..b904bad42b 100644 --- a/common/pkg/config/libpodConfig.go +++ b/common/pkg/config/libpodConfig.go @@ -267,7 +267,9 @@ func systemLibpodConfigs() ([]string, error) { if err != nil { containersConfPath = filepath.Join("$HOME", UserOverrideContainersConfig) } - logrus.Warnf("Found deprecated file %s, please remove. Use %s to override defaults.\n", path, containersConfPath) + // TODO: Raise to Warnf, when Podman is updated to + // remove libpod.conf by default + logrus.Debugf("Found deprecated file %s, please remove. Use %s to override defaults.\n", path, containersConfPath) return []string{path}, nil } return nil, err @@ -275,11 +277,15 @@ func systemLibpodConfigs() ([]string, error) { configs := []string{} if _, err := os.Stat(_rootConfigPath); err == nil { - logrus.Warnf("Found deprecated file %s, please remove. Use %s to override defaults.\n", _rootConfigPath, OverrideContainersConfig) + // TODO: Raise to Warnf, when Podman is updated to + // remove libpod.conf by default + logrus.Debugf("Found deprecated file %s, please remove. Use %s to override defaults.\n", _rootConfigPath, OverrideContainersConfig) configs = append(configs, _rootConfigPath) } if _, err := os.Stat(_rootOverrideConfigPath); err == nil { - logrus.Warnf("Found deprecated file %s, please remove. Use %s to override defaults.\n", _rootOverrideConfigPath, OverrideContainersConfig) + // TODO: Raise to Warnf, when Podman is updated to + // remove libpod.conf by default + logrus.Debugf("Found deprecated file %s, please remove. Use %s to override defaults.\n", _rootOverrideConfigPath, OverrideContainersConfig) configs = append(configs, _rootOverrideConfigPath) } return configs, nil