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

Merge pull request #18185 from rallytime/pylint

Browse Source 
Pylint fixing
This commit is contained in:
Pedro Algarvio 2014-11-18 02:22:41 +00:00
commit e43b373865
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/dockerio.py
View File

@ -1607,7 +1607,7 @@ def pull(repo, tag=None, insecure_registry=False):
client = _get_client()
status = base_status.copy()
try:
kwargs = {'tag' : tag}
kwargs = {'tag': tag}
# if docker-py version is greater than 0.5.0 use the
# insecure_registry parameter
if salt.utils.compare_versions(ver1=docker.__version__,
@ -1706,7 +1706,7 @@ def push(repo, tag=None, quiet=False, insecure_registry=False):
status = base_status.copy()
registry, repo_name = docker.auth.resolve_repository_name(repo)
try:
kwargs = {'tag' : tag}
kwargs = {'tag': tag}
# if docker-py version is greater than 0.5.0 use the
# insecure_registry parameter
if salt.utils.compare_versions(ver1=docker.__version__,

1
salt/utils/dictupdate.py
View File

@ -12,6 +12,7 @@ import six
# Import salt libs
from salt.utils.odict import OrderedDict
def update(dest, upd):
for key, val in six.iteritems(upd):
if isinstance(val, collections.Mapping):