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

Merge pull request #1743 from aanand/fix-stream-stack-trace 

Stop printing a stack trace when there's an error when pulling
This commit is contained in:
Mazz Mosley 2015-07-21 12:15:18 +01:00
parent 85c90daa18 38a6209acd
commit f721389447
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compose/cli/main.py
View File

@ -16,6 +16,7 @@ from ..const import DEFAULT_TIMEOUT
from ..project import NoSuchService, ConfigurationError from ..project import NoSuchService, ConfigurationError
from ..service import BuildError, NeedsBuildError from ..service import BuildError, NeedsBuildError
from ..config import parse_environment from ..config import parse_environment
from ..progress_stream import StreamOutputError
from .command import Command from .command import Command
from .docopt_command import NoSuchCommand from .docopt_command import NoSuchCommand
from .errors import UserError from .errors import UserError
@ -48,6 +49,9 @@ def main():
except BuildError as e: except BuildError as e:
log.error("Service '%s' failed to build: %s" % (e.service.name, e.reason)) log.error("Service '%s' failed to build: %s" % (e.service.name, e.reason))
sys.exit(1) sys.exit(1)
except StreamOutputError as e:
log.error(e)
sys.exit(1)
except NeedsBuildError as e: except NeedsBuildError as e:
log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name) log.error("Service '%s' needs to be built, but --no-build was passed." % e.service.name)
sys.exit(1) sys.exit(1)