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

[Jelmer Vernooij]

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

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.

[Gavin Panella (allenap)]

review: Approve

=== 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