Rev 3268: (bialix) setup.py script explicitly checks for Python version. (#200569) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Mar 12 21:36:11 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3268
revision-id:pqm at pqm.ubuntu.com-20080312213603-mtgxmfy3td5n04yh
parent: pqm at pqm.ubuntu.com-20080312073810-r3a7ot93mw7hmk1m
parent: bialix at ukr.net-20080312195537-pwgebmgki3p4zjbg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-03-12 21:36:03 +0000
message:
(bialix) setup.py script explicitly checks for Python version. (#200569)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3260.1.3
revision-id:bialix at ukr.net-20080312195537-pwgebmgki3p4zjbg
parent: bialix at ukr.net-20080311084942-w1w0w3v0m20p2pbc
parent: pqm at pqm.ubuntu.com-20080312073810-r3a7ot93mw7hmk1m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: setup.py
timestamp: Wed 2008-03-12 21:55:37 +0200
message:
merge bzr.dev
added:
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3260.1.2
revision-id:bialix at ukr.net-20080311084942-w1w0w3v0m20p2pbc
parent: bialix at ukr.net-20080310211406-no2b03euv27hhs8g
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: setup.py
timestamp: Tue 2008-03-11 10:49:42 +0200
message:
use sys.version_info
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3260.1.1
revision-id:bialix at ukr.net-20080310211406-no2b03euv27hhs8g
parent: pqm at pqm.ubuntu.com-20080310202441-q09492ma24sdzp51
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: setup.py
timestamp: Mon 2008-03-10 23:14:06 +0200
message:
setup.py script explicitly checks for Python version. (#200569)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'NEWS'
--- a/NEWS 2008-03-12 05:59:01 +0000
+++ b/NEWS 2008-03-12 19:55:37 +0000
@@ -71,6 +71,9 @@
* Redirecting the output from ``bzr merge`` (when the remembered
location is used) now works. (John Arbash Meinel)
+ * setup.py script explicitly checks for Python version.
+ (Jari Aalto, Alexander Belchenko, #200569)
+
* UnknownFormatErrors no longer refer to branches regardless of kind of
unknown format. (Daniel Watkins, #173980)
=== modified file 'setup.py'
--- a/setup.py 2008-02-20 10:36:15 +0000
+++ b/setup.py 2008-03-11 08:49:42 +0000
@@ -9,6 +9,10 @@
import os
import sys
+if sys.version_info < (2, 4):
+ sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
+ sys.exit(1)
+
import bzrlib
##
@@ -34,35 +38,6 @@
]},
}
-######################################################################
-# Reinvocation stolen from bzr, we need python2.4 by virtue of bzr_man
-# including bzrlib.help
-
-try:
- version_info = sys.version_info
-except AttributeError:
- version_info = 1, 5 # 1.5 or older
-
-REINVOKE = "__BZR_REINVOKE"
-NEED_VERS = (2, 4)
-KNOWN_PYTHONS = ('python2.4',)
-
-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
- sys.stderr.write("bzr: error: cannot find a suitable python interpreter\n")
- sys.stderr.write(" (need %d.%d or later)" % NEED_VERS)
- sys.stderr.write('\n')
- sys.exit(1)
-if getattr(os, "unsetenv", None) is not None:
- os.unsetenv(REINVOKE)
-
def get_bzrlib_packages():
"""Recurse through the bzrlib directory, and extract the package names"""
More information about the bazaar-commits
mailing list