diff options
Diffstat (limited to 'weave/weave_version.py')
| -rw-r--r-- | weave/weave_version.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/weave/weave_version.py b/weave/weave_version.py index e32d72b08..0f549815c 100644 --- a/weave/weave_version.py +++ b/weave/weave_version.py @@ -8,13 +8,20 @@ try: cvs_minor = cvs_version[-3] cvs_serial = cvs_version[-1] except ImportError,msg: - print msg cvs_minor = 0 cvs_serial = 0 -if release_level: - weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\ - '_%(cvs_minor)d.%(cvs_serial)d' % (locals ()) +if cvs_minor or cvs_serial: + if release_level: + weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\ + '_%(cvs_minor)d.%(cvs_serial)d' % (locals ()) + else: + weave_version = '%(major)d.%(minor)d.%(micro)d'\ + '_%(cvs_minor)d.%(cvs_serial)d' % (locals ()) else: - weave_version = '%(major)d.%(minor)d.%(micro)d'\ - '_%(cvs_minor)d.%(cvs_serial)d' % (locals ()) + if release_level: + weave_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\ + % (locals ()) + else: + weave_version = '%(major)d.%(minor)d.%(micro)d'\ + % (locals ()) |