BzrTools

Merge lp://qastaging/~maxb/bzrtools/fix-version-check into lp://qastaging/bzrtools

  1. fix-version-check
  2. Merge into bzrtools.dev
Proposed by Max Bowsher
Status: Merged
Approved by: Aaron Bentley
Approved revision: 734
Merged at revision: not available
Proposed branch: lp://qastaging/~maxb/bzrtools/fix-version-check
Merge into: lp://qastaging/bzrtools
Diff against target: 21 lines (+2/-2)
1 file modified
command.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~maxb/bzrtools/fix-version-check
Reviewer Review Type Date Requested Status
Aaron Bentley Approve
Review via email: mp+14592@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Max Bowsher (maxb) wrote :

I tried using bzrtools trunk with bzr 2.0, and got a nasty exception. The incompatibility error is assuming that bzrtools' own version_info is always a 3-tuple, but it's a 5-tuple at the moment.

Revision history for this message
Aaron Bentley (abentley) wrote :

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

Max Bowsher wrote:
> Max Bowsher has proposed merging lp:~maxb/bzrtools/fix-version-check into lp:bzrtools.
>
> Requested reviews:
> Aaron Bentley (abentley)
>
>
> I tried using bzrtools trunk with bzr 2.0, and got a nasty exception. The incompatibility error is assuming that bzrtools' own version_info is always a 3-tuple, but it's a 5-tuple at the moment.

 merge approved

Thanks, taken.

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

iEYEARECAAYFAkr48EgACgkQ0F+nu1YWqI0+bgCfTKsM8Li0CG9rBF+RaD3g+OEW
wNcAnR/aiyztByoPmDnleZtI2XdHnhXo
=uMYh
-----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 'command.py'
2--- command.py 2008-02-20 14:28:36 +0000
3+++ command.py 2009-11-07 17:15:20 +0000
4@@ -1,7 +1,7 @@
5 import bzrlib
6 from bzrlib import commands
7
8-from version import *
9+from version import version_info, __version__
10
11
12 class BzrToolsCommand(commands.Command):
13@@ -35,7 +35,7 @@
14 warning('Installed Bazaar version %s is too old to be used with'
15 ' plugin \n'
16 '"Bzrtools" %s.' % (
17- bzrlib.__version__, '%s.%s.%s' % version_info))
18+ bzrlib.__version__, __version__))
19 # Not using BzrNewError, because it may not exist.
20 return 3
21 else:

Subscribers

People subscribed via source and target branches