diff --git a/lib/pyraf/__init__.py b/lib/pyraf/__init__.py index 2dbae12f..ce78f823 100644 --- 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 index cdd39b9e..f7c163f4 100755 --- 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}"