tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pep8 errors from the new pep8 release. 

Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-12 14:02:30 -05:00
parent 9e36847eb9
commit ed4db542d6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/project.py
View File

@ -344,8 +344,8 @@ class Project(object):
updated_dependencies = [ updated_dependencies = [
name name
for name in service.get_dependency_names() for name in service.get_dependency_names()
if name in plans if name in plans and
and plans[name].action in ('recreate', 'create') plans[name].action in ('recreate', 'create')
] ]
if updated_dependencies and strategy.allows_recreate: if updated_dependencies and strategy.allows_recreate:

6
compose/service.py
View File

@ -535,9 +535,9 @@ class Service(object):
# unqualified hostname and a domainname unless domainname # unqualified hostname and a domainname unless domainname
# was also given explicitly. This matches the behavior of # was also given explicitly. This matches the behavior of
# the official Docker CLI in that scenario. # the official Docker CLI in that scenario.
if ('hostname' in container_options if ('hostname' in container_options and
and 'domainname' not in container_options 'domainname' not in container_options and
and '.' in container_options['hostname']): '.' in container_options['hostname']):
parts = container_options['hostname'].partition('.') parts = container_options['hostname'].partition('.')
container_options['hostname'] = parts[0] container_options['hostname'] = parts[0]
container_options['domainname'] = parts[2] container_options['domainname'] = parts[2]