Merge lp:~gz/bzr/trivial_no_bzr_reinvoke into lp:bzr

[Martin Packman]

No longer try reinvoking with a newer python version from the bzr script

Removes a trick in the bzr script for switching python interpreter if the wrong one is used.

Since "import warnings" was added, this has been pointless for Python < 2.1 and with "from __future__ import absolute_import" it will also stop working for < 2.5 as well:

<https://code.launchpad.net/~jelmer/bzr/future-absolute-imports/+merge/86164>

Given this can silently hide installation problems and result in worse performance, I think we're better off just complaining and exiting.

[Jelmer Vernooij (jelmer)]

review: Approve

[Vincent Ladeuil (vila)]

My eyes stopped bleeding ;)

review: Approve

[Martin Packman (gz)]

sent to pqm by email

=== modified file 'bzr'
--- bzr	2011-12-09 17:13:21 +0000
+++ bzr	2011-12-19 14:16:31 +0000
@@ -25,29 +25,12 @@
 # update this on each release
 _script_version = (2, 5, 0)
 
-try:
-    version_info = sys.version_info
-except AttributeError:
-    version_info = 1, 5  # 1.5 or older
-
-REINVOKE = "__BZR_REINVOKE"
 NEED_VERS = (2, 6)
-KNOWN_PYTHONS = ('python2.6', 'python2.7')
 
-if version_info < NEED_VERS:
-    if not os.environ.has_key(REINVOKE):
-        # mutating os.environ doesn't work in old Pythons
-        os.putenv(REINVOKE, "1")
-        for python in KNOWN_PYTHONS:
-            try:
-                os.execvp(python, [python] + sys.argv)
-            except OSError:
-                pass
+if sys.version_info < NEED_VERS:
     sys.stderr.write("bzr: error: cannot find a suitable python interpreter\n")
     sys.stderr.write("  (need %d.%d or later)\n" % NEED_VERS)
     sys.exit(1)
-if hasattr(os, "unsetenv"):
-    os.unsetenv(REINVOKE)
 
 
 profiling = False