Canonical SSO provider

Merge lp:~jml/canonical-identity-provider/acceptance-script into lp:canonical-identity-provider/release

  1. acceptance-script
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 604
Proposed branch: lp:~jml/canonical-identity-provider/acceptance-script
Merge into: lp:canonical-identity-provider/release
Diff against target: 21 lines (+2/-3)
1 file modified
scripts/run-acceptance-tests (+2/-3)
To merge this branch: bzr merge lp:~jml/canonical-identity-provider/acceptance-script
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+143169@code.launchpad.net

Commit message

Fix django_project/local.cfg symlink

Description of the change

Fix django_project/local.cfg symlink

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/run-acceptance-tests'
2--- scripts/run-acceptance-tests 2013-01-14 17:28:59 +0000
3+++ scripts/run-acceptance-tests 2013-01-14 19:06:21 +0000
4@@ -34,15 +34,14 @@
5 # make sure that dependencies are up to date
6 fab bootstrap
7 if [ -d branches/project ]; then
8- cd branches/project
9- bzr pull
10+ bzr pull -d branches/project
11 else
12 bzr branch ${CONFIG_BRANCH} branches/project
13 fi
14
15 # Set up the correct Django configuration.
16 rm django_project/local.cfg
17-ln -s scripts/local.cfg-${TARGET} django_project/local.cfg
18+ln -s `pwd`/scripts/local.cfg-${TARGET} django_project/local.cfg
19
20 # clean old results
21 rm -rf results/*