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

Use multiple returns rather than overriding. 

Also added a doc string for clarity.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
This commit is contained in:
Mazz Mosley 2015-10-06 13:10:38 +01:00
parent 467c731869
commit 0ff84a78c6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compose/service.py
View File

@ -986,16 +986,18 @@ def parse_volume_spec(volume_config):
def build_volume_from(volume_from_spec): def build_volume_from(volume_from_spec):
volumes_from = [] """
volume_from can be either a service or a container. We want to return the
container.id and format it into a string complete with the mode.
"""
if isinstance(volume_from_spec.source, Service): if isinstance(volume_from_spec.source, Service):
containers = volume_from_spec.source.containers(stopped=True) containers = volume_from_spec.source.containers(stopped=True)
if not containers: if not containers:
volumes_from = ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)] return ["{}:{}".format(volume_from_spec.source.create_container().id, volume_from_spec.mode)]
else: else:
volumes_from = ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers] return ["{}:{}".format(container.id, volume_from_spec.mode) for container in containers]
elif isinstance(volume_from_spec.source, Container): elif isinstance(volume_from_spec.source, Container):
volumes_from = ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)] return ["{}:{}".format(volume_from_spec.source.id, volume_from_spec.mode)]
return volumes_from
def parse_volume_from_spec(volume_from_config): def parse_volume_from_spec(volume_from_config):