make version more legible

git-svn-id: https://aeon.stsci.edu/ssb/svn/pyraf/trunk@2563 05fa7843-0683-0410-9e38-dfee850dc5be
iraf-community · Mar 11, 2016 · 8e9d3d8 · 8e9d3d8
1 parent 0e65ce0
commit 8e9d3d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/pyraf/__init__.py b/lib/pyraf/__init__.py
@@ -18,7 +18,7 @@
 if __version__.endswith('dev'):
     try: # did we set this via git?
         from .version_vcs import __vcs_revision__
-        __version__ = __version__+__vcs_revision__
+        __version__ = __version__+'-'+__vcs_revision__
     except: # must be using svn still
         if len(__svn_revision__) > 0 and __svn_revision__[0].isdigit():
             __version__ = __version__+__svn_revision__

diff --git a/tools/createTarBall.csh b/tools/createTarBall.csh
@@ -206,8 +206,12 @@ endif
 
 # set full ver (verinfo3) to be n.m.devNNNNN (if dev) or n.m.rNNNNN (if not)
 set junk = `echo $verinfo1 |grep dev`
-if  ("$junk" == "$verinfo1") then
-   set verinfo3 = "${verinfo1}${verinfo2}"
+if ("$junk" == "$verinfo1") then
+   if ($use_git == "1") then
+       set verinfo3 = "${verinfo1}-${verinfo2}"
+   else
+       set verinfo3 = "${verinfo1}${verinfo2}"
+   endif
 else
    if ($use_git == "1") then
       set verinfo3 = "${verinfo1}.${verinfo2}"