Merge lp:~milo/linaro-license-protection/bug1183689 into lp:linaro-license-protection/configs

Proposed by Milo Casagrande
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 32
Merged at revision: 32
Proposed branch: lp:~milo/linaro-license-protection/bug1183689
Merge into: lp:linaro-license-protection/configs
Diff against target: 33 lines (+6/-6)
2 files modified
wsgi/wsgi_releases.py (+3/-3)
wsgi/wsgi_snapshots.py (+3/-3)
To merge this branch: bzr merge lp:~milo/linaro-license-protection/bug1183689
Reviewer Review Type Date Requested Status
James Tunnicliffe (community) Approve
Review via email: mp+165544@code.launchpad.net

This proposal supersedes a proposal from 2013-05-24.

Description of the change

Fixed Python paths to point to the correct ones.
On the new migrated EC2 instance, Python 2.6 is not installed anymore.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Fixed the target branch.

Revision history for this message
James Tunnicliffe (dooferlad) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'wsgi/wsgi_releases.py'
--- wsgi/wsgi_releases.py 2012-08-23 17:07:37 +0000
+++ wsgi/wsgi_releases.py 2013-05-24 07:34:29 +0000
@@ -5,9 +5,9 @@
5"""5"""
6import os6import os
7import sys7import sys
8sys.path.append("/usr/lib/python2.6/dist-packages")8sys.path.append("/usr/lib/python2.7/dist-packages")
9sys.path.append("/usr/lib/pymodules/python2.6")9sys.path.append("/usr/lib/pymodules/python2.7")
10sys.path.append("/usr/lib/python2.6")10sys.path.append("/usr/lib/python2.7")
1111
12sys.path.append("/srv/releases.linaro.org")12sys.path.append("/srv/releases.linaro.org")
13sys.path.append("/srv/releases.linaro.org/linaro-license-protection")13sys.path.append("/srv/releases.linaro.org/linaro-license-protection")
1414
=== modified file 'wsgi/wsgi_snapshots.py'
--- wsgi/wsgi_snapshots.py 2012-08-23 17:07:37 +0000
+++ wsgi/wsgi_snapshots.py 2013-05-24 07:34:29 +0000
@@ -5,9 +5,9 @@
5"""5"""
6import os6import os
7import sys7import sys
8sys.path.append("/usr/lib/python2.6/dist-packages")8sys.path.append("/usr/lib/python2.7/dist-packages")
9sys.path.append("/usr/lib/pymodules/python2.6")9sys.path.append("/usr/lib/pymodules/python2.7")
10sys.path.append("/usr/lib/python2.6")10sys.path.append("/usr/lib/python2.7")
1111
12sys.path.append("/srv/snapshots.linaro.org")12sys.path.append("/srv/snapshots.linaro.org")
13sys.path.append("/srv/snapshots.linaro.org/linaro-license-protection")13sys.path.append("/srv/snapshots.linaro.org/linaro-license-protection")

Subscribers

People subscribed via source and target branches