version finder now calls git-describe; py2exe build script fixed up

[p2pool.git] / p2pool / __init__.py

diff --git a/p2pool/__init__.py b/p2pool/__init__.py
index a1a736a..670e2fc 100644 (file)
--- a/p2pool/__init__.py
+++ b/p2pool/__init__.py
@@ -1,18 +1,31 @@
 import os
 import sys
+import traceback
+import subprocess
 
 def _get_version():
     try:
-        git_dir = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), '.git')
-        head = open(os.path.join(git_dir, 'HEAD')).read().strip()
-        prefix = 'ref: '
-        if head.startswith(prefix):
-            path = head[len(prefix):].split('/')
-            return open(os.path.join(git_dir, *path)).read().strip()
-        else:
-            return head
+        return subprocess.check_output(['git', 'describe', '--always', '--dirty'], cwd=os.path.dirname(os.path.abspath(__file__))).strip()
+    except:
+        pass
+    try:
+        root_dir = os.path.abspath(os.path.dirname(sys.argv[0]))
+        git_dir = os.path.join(root_dir, '.git')
+        if os.path.exists(git_dir):
+            head = open(os.path.join(git_dir, 'HEAD')).read().strip()
+            prefix = 'ref: '
+            if head.startswith(prefix):
+                path = head[len(prefix):].split('/')
+                return open(os.path.join(git_dir, *path)).read().strip()[:7]
+            else:
+                return head[:7]
+        dir_name = os.path.split(root_dir)[1]
+        chars = '0123456789abcdef'
+        if len(dir_name) >= 7 and (len(dir_name) == 7 or dir_name[-8] not in chars) and all(c in chars for c in dir_name[-7:]):
+            return dir_name[-7:]
     except Exception, e:
-        return 'unknown (%s)' % (str(e),)
+        traceback.print_exc()
+    return 'unknown'
 
 __version__ = _get_version()