← Back to branch summary

~gandelman-a/juju-deployer/darwin_redux

« back to all changes in this revision

Viewing changes to juju_deployer/utils.py

  • Committer: Adam Gandelman
  • Date: 2013-07-11 19:12:32 UTC
  • Revision ID: adamg@canonical.com-20130711191232-mx8tspo4aa6cnsnq
Update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
juju_deployer/utils.py
25
25
else:
26
26
    yaml_optimized = True
27
27
 
28
 
 
29
28
DEFAULT_LOGGING = """
30
29
version: 1
31
30
formatters:
152
151
    try:
153
152
        cwd = cwd or abspath(".")
154
153
        output = subprocess.check_output(
155
 
            params, cwd=cwd, stderr=subprocess.STDOUT, env=os.environ)
 
154
            params, cwd=cwd, env=os.environ)
156
155
    except subprocess.CalledProcessError, e:
157
156
        log.error(*args, **kw)
158
157
        log.error("Command (%s) Output:\n\n %s", " ".join(params), e.output)