First merge with 2.5 branch.

[blender.git] / release / getversion.py

diff --git a/release/getversion.py b/release/getversion.py
index a52d886a2ff1d6ef3977f260b1c2526c2ffcfed1..fd52129bf4a2d59922186f2d0c1b95024b922876 100755 (executable)
--- a/release/getversion.py
+++ b/release/getversion.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# -*- mode: python; tab-width: 4; indent-tabs-mode: t; -*-
+# vim: tabstop=4
+# $Id#
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -18,9 +21,9 @@
 # The Original Code is Copyright (C) 2008 by the Blender Foundation
 # All rights reserved.
 #
-# The Original Code is: all of this file.
+# The Original Code is: see repository.
 #
-# Contributor(s): none yet.
+# Contributor(s): see repository.
 #
 import sys, os, re
 
@@ -49,7 +52,11 @@ for line in infile.readlines():
 
 infile.close()
 
+# Major was changed to float, but minor is still a string
 if minor and major:
-       print str(major)+"."+minor
+       if minor == "0":
+               print "%.2f" % major
+       else:
+               print "%.2f.%s" % (major, minor)
 else:
-       print unkownversion
+       print "unknownversion"