Rev 4664: Change 'bzr --version' to always give the major.minor.micro version in http://bazaar.launchpad.net/~jameinel/bzr/2.0-full-version

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0-full-version

------------------------------------------------------------
revno: 4664
revision-id: john at arbash-meinel.com-20090910154631-m89rnpctaohkzfhg
parent: pqm at pqm.ubuntu.com-20090909084829-8nzz6kop4pnhoftv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0-full-version
timestamp: Thu 2009-09-10 10:46:31 -0500
message:
  Change 'bzr --version' to always give the major.minor.micro version
  
  Formerly if '.micro' was '.0' it would only print 'major.minor'.
  However, now that we are having a 2.0 stable release series, it makes more
  sense to start with 2.0.0 and increment from there.
-------------- next part --------------
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2009-08-27 07:49:53 +0000
+++ b/bzrlib/__init__.py	2009-09-10 15:46:31 +0000
@@ -81,7 +81,7 @@
     ...
     ValueError: version_info (1, 4, 0, 'wibble', 0) not valid
     """
-    if len(version_info) == 2 or version_info[2] == 0:
+    if len(version_info) == 2:
         main_version = '%d.%d' % version_info[:2]
     else:
         main_version = '%d.%d.%d' % version_info[:3]