2 patches for bzr.dev/cython.dev
Denys Duchier
denys.duchier at univ-orleans.fr
Tue Aug 30 14:55:34 UTC 2011
I am running bzr.dev and cython.dev.
cython dev has version "0.15+" (notice the plus) which makes bzr's
setup.py choke. here is a possible fix:
----8<--------------------------------------------------------------
=== modified file 'setup.py'
--- setup.py 2011-08-25 11:02:37 +0000
+++ setup.py 2011-08-30 14:44:42 +0000
@@ -202,7 +202,9 @@
from distutils.command.build_ext import build_ext
else:
have_pyrex = True
- pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
+ import re
+ _version = re.match("^[0-9.]+", pyrex_version).group(0)
+ pyrex_version_info = tuple(map(int, _version.split('.')))
class build_ext_if_possible(build_ext):
----8<--------------------------------------------------------------
after that, "bzr status" bombs in the bzr.dev directory because of an
uninitialized variable "changed". here is a possible fix:
----8<--------------------------------------------------------------
=== modified file 'bzrlib/_dirstate_helpers_pyx.pyx'
--- bzrlib/_dirstate_helpers_pyx.pyx 2011-04-22 14:12:22 +0000
+++ bzrlib/_dirstate_helpers_pyx.pyx 2011-08-30 14:43:05 +0000
@@ -1793,6 +1793,7 @@
advance_entry = -1
advance_path = -1
result = None
+ changed = None
path_handled = 0
if current_entry is None:
# unversioned - the check for path_handled when the path
----8<--------------------------------------------------------------
Cheers,
--Denys
More information about the bazaar
mailing list