Merge lp:~jjo/juju-deployer/support-JUJU_REPOSITORY-env_var into lp:juju-deployer

Proposed by JuanJo Ciarlante
Status: Merged
Merged at revision: 87
Proposed branch: lp:~jjo/juju-deployer/support-JUJU_REPOSITORY-env_var
Merge into: lp:juju-deployer
Diff against target: 13 lines (+2/-1)
1 file modified
deployer/charm.py (+2/-1)
To merge this branch: bzr merge lp:~jjo/juju-deployer/support-JUJU_REPOSITORY-env_var
Reviewer Review Type Date Requested Status
juju-deployers Pending
Review via email: mp+196984@code.launchpad.net

Commit message

support JUJU_REPOSITORY environment variable (to avoid having to chdir to it for juju-deployer usage), fixes lp#1229390

To post a comment you must log in.
Revision history for this message
JuanJo Ciarlante (jjo) wrote :

support JUJU_REPOSITORY environment variable (to avoid having to chdir to it for juju-deployer usage), fixes lp#1229390

Revision history for this message
Andy Doan (doanac) wrote :

Any reason this MP hasn't gotten accepted yet? This bug is causing some problems for my team.

Revision history for this message
Kapil Thangavelu (hazmat) wrote :

merged a variant of this which configures this a bit more centrally in the
config stack when it constructs deployments to use the env var if defined.
The deployments already supported a repository path variable just not
defined outside of test previously.

On Wed, Jan 22, 2014 at 11:04 PM, Andy Doan <email address hidden>wrote:

> Any reason this MP hasn't gotten accepted yet? This bug is causing some
> problems for my team.
> --
>
> https://code.launchpad.net/~jjo/juju-deployer/support-JUJU_REPOSITORY-env_var/+merge/196984
> Your team juju-deployers is requested to review the proposed merge of
> lp:~jjo/juju-deployer/support-JUJU_REPOSITORY-env_var into lp:juju-deployer.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/charm.py'
2--- deployer/charm.py 2013-08-21 07:29:55 +0000
3+++ deployer/charm.py 2013-11-27 21:27:54 +0000
4@@ -52,7 +52,8 @@
5 if name.startswith('cs:'):
6 store_url = name
7 else:
8- charm_path = path_join(series_path, name)
9+ charm_path = path_join(os.environ.get('JUJU_REPOSITORY', '.'),
10+ series_path, name)
11 build = d.get('build', '')
12 if not store_url:
13 store_url = d.get('charm_url', None)

Subscribers

People subscribed via source and target branches