Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/deploy-upgrade into lp:uci-engine

Proposed by Chris Johnston on 2014-04-09

Status:	Merged
Approved by:	Chris Johnston on 2014-04-09
Approved revision:	424
Merged at revision:	424
Proposed branch:	lp:~cjohnston/uci-engine/deploy-upgrade
Merge into:	lp:uci-engine
Diff against target:	11 lines (+1/-0) 1 file modified juju-deployer/deploy.py (+1/-0)
To merge this branch:	bzr merge lp:~cjohnston/uci-engine/deploy-upgrade
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Andy Doan (community)		2014-04-09	Approve on 2014-04-09
PS Jenkins bot (community)	continuous-integration		Approve on 2014-04-09
Review via email: mp+215040@code.launchpad.net

Fix juju-deployer not being on sys.path

When running ./juju-deployer/deploy.py --upgrade, branches/juju-deployer wasn't being added to the sys.path causing import deployer.* to fail

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

PASSED: Continuous integration, rev:424
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/482/
Executed test runs:

review: Approve (continuous-integration)

Revision history for this message

Andy Doan (doanac) on 2014-04-09:

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'juju-deployer/deploy.py'
2	--- juju-deployer/deploy.py 2014-04-01 03:30:01 +0000
3	+++ juju-deployer/deploy.py 2014-04-09 21:24:43 +0000
4	@@ -208,6 +208,7 @@
5	# For an obscure reason tag:0.3.1 is not in lp:juju-deployer
6	get_or_pull_branch('lp:juju-deployer', dest, revision='revno:103')
7	prepend_path('PYTHONPATH', dest)
8	+ sys.path.insert(0, dest)
9	# FIXME: This duplicates setup.py and shouldn't be needed. This specific
10	# piece (juju-deployer) is a weird beast, it installs from source (not pip
11	# nor package), it requires amulet which itself requires urllib3 (among