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 eccf216..670e2fc 100644 (file)
--- a/p2pool/__init__.py
+++ b/p2pool/__init__.py
@@ -1,9 +1,14 @@
 import os
 import sys
 import traceback
+import subprocess
 
 def _get_version():
     try:
+        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):