summaryrefslogtreecommitdiff
path: root/scipy_base/scipy_base_version.py
diff options
context:
space:
mode:
Diffstat (limited to 'scipy_base/scipy_base_version.py')
-rw-r--r--scipy_base/scipy_base_version.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/scipy_base/scipy_base_version.py b/scipy_base/scipy_base_version.py
index cef0fd52a..6c5b066d7 100644
--- a/scipy_base/scipy_base_version.py
+++ b/scipy_base/scipy_base_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:
- scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+if cvs_minor or cvs_serial:
+ if release_level:
+ scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+ '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+ else:
+ scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
'_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
else:
- scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
- '_%(cvs_minor)d.%(cvs_serial)d' % (locals ())
+ if release_level:
+ scipy_base_version = '%(major)d.%(minor)d.%(micro)d_%(release_level)s'\
+ % (locals ())
+ else:
+ scipy_base_version = '%(major)d.%(minor)d.%(micro)d'\
+ % (locals ())