lava-manifest

Merge lp:~mwhudson/lava-manifest/always-set-VIRTUAL_ENV into lp:~linaro-validation/lava-manifest/trunk

  1. always-set-VIRTUAL_ENV
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 95
Proposed branch: lp:~mwhudson/lava-manifest/always-set-VIRTUAL_ENV
Merge into: lp:~linaro-validation/lava-manifest/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
buildout.cfg (+1/-1)
To merge this branch: bzr merge lp:~mwhudson/lava-manifest/always-set-VIRTUAL_ENV
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+141676@code.launchpad.net

Description of the change

This branch changes the script initialization to set VIRTUAL_ENV in the environment, which is used by some things (in particular, the dispatcher) to find config files. This means that running the dispatcher without running the activate script still works.

This is sorta a response to https://code.launchpad.net/~doanac/lava-dispatcher/config-finding-fix/+merge/140964

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2012-12-12 22:32:28 +0000
3+++ buildout.cfg 2013-01-02 21:08:19 +0000
4@@ -21,7 +21,7 @@
5
6 [server]
7 recipe = lava-manifest:scripts
8-initialization = import os; os.environ["DJANGO_DEBIAN_SETTINGS_TEMPLATE"] = "${instance:django-debian-settings-template}";
9+initialization = import os; os.environ["DJANGO_DEBIAN_SETTINGS_TEMPLATE"] = "${instance:django-debian-settings-template}"; os.environ["VIRTUAL_ENV"] = "${instance:instance-path}";
10 interpreter = py
11 # The fact that we have to list psycopg2, keyring, and python-dateutil
12 # here implies bugs in some package dependencies.

Subscribers

People subscribed via source and target branches