mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Revert change
This commit is contained in:
parent
761c576bf5
commit
e2bb8361cf
1 changed files with 8 additions and 12 deletions
|
@ -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, *_):
|
||||
|
|
Loading…
Add table
Reference in a new issue