Bazaar

Merge lp:~mbp/bzr/449372-pyrex-blacklist into lp:bzr/2.0

  1. 449372-pyrex-blacklist
  2. Merge into 2.0
Proposed by Martin Pool
Status: Merged
Approved by: John A Meinel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~mbp/bzr/449372-pyrex-blacklist
Merge into: lp:bzr/2.0
Diff against target: 32 lines (+6/-1)
2 files modified
NEWS (+3/-0)
setup.py (+3/-1)
To merge this branch: bzr merge lp:~mbp/bzr/449372-pyrex-blacklist
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+17182@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

This stops bzr building with pyrex 0.9.4* which apparently causes crashes in compiled code.

John did the thinking, I'm just writing the patch. :)

I'm proposing this for 2.0. Generally I would be quite wary about doing anything that changes dependencies in the stable branch, but given that it will be broken without it, it seems to make sense.

In Ubuntu <http://packages.ubuntu.com/search?keywords=python-pyrex> I see all supported releases are after 0.9.6, except dapper still on 0.9.4.1-2ubuntu2.

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
> Martin Pool has proposed merging lp:~mbp/bzr/449372-pyrex-blacklist into lp:bzr/2.0.
>
> Requested reviews:
> bzr-core (bzr-core)
> Related bugs:
> #449372 segfault when unrevisioned files exist in working tree
> https://bugs.launchpad.net/bugs/449372
>
>
> This stops bzr building with pyrex 0.9.4* which apparently causes crashes in compiled code.
>
> John did the thinking, I'm just writing the patch. :)
>
> I'm proposing this for 2.0. Generally I would be quite wary about doing anything that changes dependencies in the stable branch, but given that it will be broken without it, it seems to make sense.
>
> In Ubuntu <http://packages.ubuntu.com/search?keywords=python-pyrex> I see all supported releases are after 0.9.6, except dapper still on 0.9.4.1-2ubuntu2.
>

 merge: approve
 review: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAktL79IACgkQJdeBCYSNAAOlHwCeMoI7jdJJO4W6oqSoXoCG8YBS
5XMAoLAUbXe2ABnhkx9vO3UIasUHRnuI
=3uTf
-----END PGP SIGNATURE-----

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-01-08 01:08:40 +0000
3+++ NEWS 2010-01-12 01:48:13 +0000
4@@ -47,6 +47,9 @@
5 users, rather than something nicer.
6 (John Arbash Meinel, Barry Warsaw, #503886)
7
8+* Refuse to build with any Pyrex 0.9.4 release, as they have known bugs.
9+ (Martin Pool, John Arbash Meinel, #449372)
10+
11 * The 2a format wasn't properly restarting autopacks when something
12 changed underneath it (like another autopack). Now concurrent
13 autopackers will properly succeed. (John Arbash Meinel, #495000)
14
15=== modified file 'setup.py'
16--- setup.py 2009-10-30 14:07:31 +0000
17+++ setup.py 2010-01-12 01:48:13 +0000
18@@ -278,11 +278,13 @@
19 add_pyrex_extension('bzrlib._walkdirs_win32')
20 z_lib = 'zdll'
21 else:
22- if have_pyrex and pyrex_version == '0.9.4.1':
23+ if have_pyrex and pyrex_version.startswith('0.9.4'):
24 # Pyrex 0.9.4.1 fails to compile this extension correctly
25 # The code it generates re-uses a "local" pointer and
26 # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
27 # which is NULL safe with PY_DECREF which is not.)
28+ # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
29+ # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
30 print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
31 print 'your version of pyrex "%s". Please upgrade your pyrex' % (
32 pyrex_version,)

Subscribers

People subscribed via source and target branches