juju-deployer/deploy.py FIXME: no proper output if check_output raises an exception

def bootstrap():
    """Bootstrap juju."""

    args = ['juju', 'bootstrap', '--constraints=mem=1024M']
    try:
        subprocess.check_output(args)
    except subprocess.CalledProcessError as e:
        # FIXME: if check_output raise an exception, we don't get a proper
        # output to check for the text below -- vila 2014-02-07
        if 'environment is already bootstrapped' not in e.output:
            raise