jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2005 from lnmunhoz/master

Browse source 
Fix error message and class name from Boot2Docker to DockerMachine
This commit is contained in:
mnowster 2015-09-21 17:05:03 +01:00
commit 6f12224ec9
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compose/cli/command.py
View file

@ -41,7 +41,7 @@ class Command(DocoptCommand):
else: else:
raise errors.DockerNotFoundGeneric() raise errors.DockerNotFoundGeneric()
elif call_silently(['which', 'boot2docker']) == 0: elif call_silently(['which', 'boot2docker']) == 0:
raise errors.ConnectionErrorBoot2Docker() raise errors.ConnectionErrorDockerMachine()
else: else:
raise errors.ConnectionErrorGeneric(self.get_client().base_url) raise errors.ConnectionErrorGeneric(self.get_client().base_url)

6
compose/cli/errors.py
View file

@ -40,10 +40,10 @@ class DockerNotFoundGeneric(UserError):
""") """)
class ConnectionErrorBoot2Docker(UserError): class ConnectionErrorDockerMachine(UserError):
def __init__(self): def __init__(self):
super(ConnectionErrorBoot2Docker, self).__init__(""" super(ConnectionErrorDockerMachine, self).__init__("""
Couldn't connect to Docker daemon - you might need to run `boot2docker up`. Couldn't connect to Docker daemon - you might need to run `docker-machine start default`.
""") """)