[merge] Find python2.5 if python2.4 isn't available

[John Arbash Meinel]

John Arbash Meinel wrote:
> The attached patch just adds python2.5 as one of the looked-for pythons.
> This handles the case where the user has a default of python2.3, but
> installs python2.5 manually.
> 
> I left python2.4 as the first default checked, because I think at this
> point, we are more comfortable running on 2.4. (We have done some
> checking, and it does seem to work with 2.5, but AFAIK we haven't done
> some thorough code auditing yet to handle some of the more recent changes)
> https://launchpad.net/products/bzr/+bug/54114
> 
> John
> =:->
> 

now with patch

=== modified file 'bzr'
--- bzr 2006-09-25 00:03:15 +0000
+++ bzr 2006-09-29 14:42:40 +0000
@@ -32,7 +32,7 @@

 REINVOKE = "__BZR_REINVOKE"
 NEED_VERS = (2, 4)
-KNOWN_PYTHONS = ('python2.4',)
+KNOWN_PYTHONS = ('python2.4','python2.5')

 if version_info < NEED_VERS:
     if not os.environ.has_key(REINVOKE):

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060929/dd754f5e/attachment.pgp