diff options
| author | Luca Falavigna <dktrkranz@debian.org> | 2011-02-10 23:18:11 +0100 |
|---|---|---|
| committer | Luca Falavigna <dktrkranz@debian.org> | 2011-02-10 23:18:11 +0100 |
| commit | 5993fb09d54d47cc362d979a9cc44ea6dce65b2a (patch) | |
| tree | fae6dc27e661b0b5542ea7efa9fb4e7efe5fa47b /bin/update-release-info.py | |
| parent | b5754794e1f526800cc5386de55238c23a539ff4 (diff) | |
| parent | 84c6f9729dbbc175431874957d0654310410bd6f (diff) | |
Merge commit 'upstream/2.0.1'
Diffstat (limited to 'bin/update-release-info.py')
| -rw-r--r-- | bin/update-release-info.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/update-release-info.py b/bin/update-release-info.py index 5c438db..7e11c4b 100644 --- a/bin/update-release-info.py +++ b/bin/update-release-info.py @@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle: # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "bin/update-release-info.py 5023 2010/06/14 22:05:46 scons" +__revision__ = "bin/update-release-info.py 5134 2010/08/16 23:02:40 bdeegan" import os import sys @@ -114,7 +114,11 @@ if version_tuple[3] != 'final': else: yyyy,mm,dd,_,_,_ = release_date version_tuple = version_tuple[:4] + ((yyyy*100 + mm)*100 + dd,) -version_string = '.'.join(map(str, version_tuple)) + version_string = '.'.join(map(str, version_tuple)) +else: + # Final release doesn't have type or builddate in version string + version_string = '.'.join(map(str, version_tuple[:3])) + version_type = version_tuple[3] if DEBUG: print 'version string', version_string |