Commits

Michael Manfre committed 81f181f

Changed get_revision() output to be more human readable and let setup.py alter as needed.

Comments (0)

Files changed (2)

 
 setup(
     name='django-mssql',
-    version=version,
+    version=version.replace(' ', '-'),
     maintainer='Michael Manfre',
     maintainer_email='mmanfre@gmail.com',
     url='http://django-mssql.googlecode.com/',

sqlserver_ado/__init__.py

     release and mercurial can be loaded the specifics about the changeset
     will be appended to the version string. 
     """
-    build_info = tuple()
     if 'dev' in VERSION:
         try:
             from mercurial import hg, ui
             repo_path = os.path.join(os.path.dirname(__file__), '..')
             repo = hg.repository(ui.ui(), repo_path)
             ctx = repo['tip']
-            build_info += (ctx.branch(), '%s:%s' % (ctx.rev(), str(ctx)))
+            build_info = 'dev %s %s:%s' % (ctx.branch(), ctx.rev(), str(ctx))
         except:
             # mercurial module missing or repository not found
-            build_info += ('unknown',)
-    v = VERSION + build_info
-    return '.'.join(map(str, v[:3] + ('_'.join(map(str, v[3:])),)))
+            build_info = 'dev-unknown'
+    v = VERSION[:VERSION.index('dev')] + (build_info,)
+    return '.'.join(map(str, v))