From e2bb8361cfa68cf9fdd7cb0d2fcbfbdb523c397d Mon Sep 17 00:00:00 2001 From: dmurphy18 Date: Tue, 18 Jun 2024 15:25:00 -0600 Subject: [PATCH] Revert change --- tests/support/pkg.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 0d2af4abcf2..d8b2dea8aab 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -1005,19 +1005,15 @@ class SaltPkgInstall: if platform.is_windows(): self.update_process_path() - ## DGM if not self.no_install: - ## DGM if self.upgrade: - ## DGM self.install_previous() - ## DGM else: - ## DGM # assume downgrade, since no_install only used in these two cases - ## DGM self.install() - ## DGM else: - ## DGM self.install() + if not self.no_install: + if self.upgrade: + self.install_previous() + else: + # assume downgrade, since no_install only used in these two cases + self.install() + else: + self.install() - # DGM Hate the use of negative flags - # if flag set, use previous version of Salt. - if self.no_install: - self.install_previous() return self def __exit__(self, *_):