valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16458 from basepi/pkgordereddict

Browse Source 
Make OrderedDict private (_OrderedDict) in pkg state
This commit is contained in:
Nicole Thomas 2014-10-08 16:41:30 -06:00
commit 0ab7e3dab3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/pkg.py
View File

@ -42,7 +42,7 @@ import re
import salt.utils
from salt.output import nested
from salt.utils import namespaced_function as _namespaced_function
from salt.utils.odict import OrderedDict
from salt.utils.odict import OrderedDict as _OrderedDict
from salt._compat import string_types
from salt.exceptions import (
CommandExecutionError, MinionError, SaltInvocationError
@ -140,7 +140,7 @@ def _find_install_targets(name=None,
# Get the ignore_types list if any from the pkg_verify argument
if type(pkg_verify) is list and any(x.get('ignore_types') is not None
for x in pkg_verify
if type(x) is OrderedDict
if type(x) is _OrderedDict
and 'ignore_types' in x):
ignore_types = next(x.get('ignore_types')
for x in pkg_verify
@ -974,7 +974,7 @@ def installed(
# Get the ignore_types list if any from the pkg_verify argument
if type(pkg_verify) is list and any(x.get('ignore_types') is not None
for x in pkg_verify
if type(x) is OrderedDict
if type(x) is _OrderedDict
and 'ignore_types' in x):
ignore_types = next(x.get('ignore_types')
for x in pkg_verify