saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Slight update to formatting

Browse source
This commit is contained in:
Gareth J. Greenaway 2017-07-28 08:33:21 -07:00
parent 74bae13939
commit 2e132daa73
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/utils/decorators/__init__.py
View file

@ -544,11 +544,11 @@ class _WithDeprecated(_DeprecationDecorator):
opts = self._globals.get('__opts__', '{}')
pillar = self._globals.get('__pillar__', '{}')
use_deprecated = full_name in opts.get(self.CFG_USE_DEPRECATED, list()) or \
full_name in pillar.get(self.CFG_USE_DEPRECATED, list())
use_deprecated = (full_name in opts.get(self.CFG_USE_DEPRECATED, list()) or
full_name in pillar.get(self.CFG_USE_DEPRECATED, list()))
use_superseded = full_name in opts.get(self.CFG_USE_SUPERSEDED, list()) or \
full_name in pillar.get(self.CFG_USE_SUPERSEDED, list())
use_superseded = (full_name in opts.get(self.CFG_USE_SUPERSEDED, list()) or
full_name in pillar.get(self.CFG_USE_SUPERSEDED, list()))
if use_deprecated and use_superseded:
raise SaltConfigurationError("Function '{0}' is mentioned both in deprecated "