Merge lp:~jelmer/launchpad/fix-devscripts-clash into lp:launchpad

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merged at revision: 13143
Proposed branch: lp:~jelmer/launchpad/fix-devscripts-clash
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
utilities/update-sourcecode (+1/-1)
To merge this branch: bzr merge lp:~jelmer/launchpad/fix-devscripts-clash
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+62959@code.launchpad.net

Commit message

[r=allenap][bug=790560] In update-sourcecode, add lib/ directory to the beginning of sys.path, in case there are clashes with system packages.

Description of the change

In utilities/update-sourcecode, add the path for "lib" to the beginning of sys.path rather than to the end.

This means that if there are system packages that clash with Launchpad packages, the Launchpad packages are used.

This is necessary because newer versions of the Ubuntu "devscripts" package include a "devscripts" Python package.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utilities/update-sourcecode'
2--- utilities/update-sourcecode 2011-01-13 18:51:12 +0000
3+++ utilities/update-sourcecode 2011-05-31 10:13:34 +0000
4@@ -8,7 +8,7 @@
5 import os
6 import sys
7
8-sys.path.append(
9+sys.path.insert(0,
10 os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
11
12 from devscripts import sourcecode