Bazaar

Merge lp://qastaging/~maxb/bzr/fix-meliae-feature-use into lp://qastaging/bzr

fix-meliae-feature-use
Merge into bzr.dev

Proposed by Max Bowsher on 2011-08-21

Status:	Merged
Approved by:	Vincent Ladeuil on 2011-08-26
Approved revision:	no longer in the source branch.
Merged at revision:	6104
Proposed branch:	lp://qastaging/~maxb/bzr/fix-meliae-feature-use
Merge into:	lp://qastaging/bzr
Diff against target:	42 lines (+3/-4) 2 files modified bzrlib/tests/features.py (+1/-2) bzrlib/tests/test__static_tuple.py (+2/-2)
To merge this branch:	bzr merge lp://qastaging/~maxb/bzr/fix-meliae-feature-use
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij (community)		2011-08-21	Approve on 2011-08-25
Review via email: mp+72353@code.qastaging.launchpad.net

Commit message

Fix meliae test feature definitions.

Description of the change

Delete features.meliae, because it is a false friend which checks only for the
availability of the meliae pure python code, not the compiled extensions.

Update only user to use features.meliae_feature, which does catch
unavailability of the compiled extensions.

---

This is especially important for Debian package builds, where the meliae compiled extensions may be available for the standard Python interpreter, but not be available for the debug interpreter.

Revision history for this message

Jelmer Vernooij (jelmer) on 2011-08-21:

review: Approve

Revision history for this message

John A Meinel (jameinel) wrote on 2011-08-22:

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

On 8/21/2011 9:00 PM, Max Bowsher wrote:
> Max Bowsher has proposed merging
> lp:~maxb/bzr/fix-meliae-feature-use into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core)
>
> For more details, see:
> https://code.launchpad.net/~maxb/bzr/fix-meliae-feature-use/+merge/72353
>
> Delete features.meliae, because it is a false friend which checks
> only for the availability of the meliae pure python code, not the
> compiled extensions.
>
> Update only user to use features.meliae_feature, which does catch
> unavailability of the compiled extensions.
>
> ---
>
> This is especially important for Debian package builds, where the
> meliae compiled extensions may be available for the standard Python
> interpreter, but not be available for the debug interpreter.

I would rather just change it to:

- -meliae = ModuleAvailableFeature('meliae')
+meliae = ModuleAvailableFeature('meliae.scanner')
...
- -meliae_feature = ModuleAvailableFeature('meliae.scanner')

I don't think "features.meliae_feature" is a better way to spell it,
and if it is redundant, lets get rid of the ugly named one.

meliae_feature isn't in the 2.4 series anyway, so it is a relatively
new introduction, and thus safe to just get rid of.

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

iEYEARECAAYFAk5SOdIACgkQJdeBCYSNAAMRpQCeIHrV2FmuhdE6a/xonVR8Wbnl
sD8AoIOzTcoyocKiCMpaCjrnQ7X3bytk
=Z/ne
-----END PGP SIGNATURE-----