← Back to team overview

launchpad-reviewers team mailing list archive

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

 

Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/fix-devscripts-clash into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #790560 in Launchpad itself: "update-sourcecode appends rather than prepends 'lib' to sys.path"
  https://bugs.launchpad.net/launchpad/+bug/790560

For more details, see:
https://code.launchpad.net/~jelmer/launchpad/fix-devscripts-clash/+merge/62959

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.
-- 
https://code.launchpad.net/~jelmer/launchpad/fix-devscripts-clash/+merge/62959
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jelmer/launchpad/fix-devscripts-clash into lp:launchpad.
=== modified file 'utilities/update-sourcecode'
--- utilities/update-sourcecode	2011-01-13 18:51:12 +0000
+++ utilities/update-sourcecode	2011-05-31 10:13:34 +0000
@@ -8,7 +8,7 @@
 import os
 import sys
 
-sys.path.append(
+sys.path.insert(0,
     os.path.join(os.path.dirname(os.path.dirname(__file__)), 'lib'))
 
 from devscripts import sourcecode


Follow ups