increased maximum difficulty multiplier to 30

[p2pool.git] / p2pool / __init__.py

diff --git a/p2pool/__init__.py b/p2pool/__init__.py
index eccf216..6773d6f 100644 (file)
--- a/p2pool/__init__.py
+++ b/p2pool/__init__.py
@@ -1,9 +1,28 @@
 import os
+import re
 import sys
 import traceback
+import subprocess
+
+def check_output(*popenargs, **kwargs):
+    process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
+    output, unused_err = process.communicate()
+    retcode = process.poll()
+    if retcode:
+        raise ValueError((retcode, output))
+    return output
 
 def _get_version():
     try:
+        try:
+            return check_output(['git', 'describe', '--always', '--dirty'], cwd=os.path.dirname(os.path.abspath(sys.argv[0]))).strip()
+        except:
+            pass
+        try:
+            return check_output(['git.cmd', 'describe', '--always', '--dirty'], cwd=os.path.dirname(os.path.abspath(sys.argv[0]))).strip()
+        except:
+            pass
+        
         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):
@@ -14,14 +33,17 @@ def _get_version():
                 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:]
+        match = re.match('p2pool-([.0-9]+)', dir_name)
+        if match:
+            return match.groups()[0]
+        
+        return 'unknown %s' % (dir_name.encode('hex'),)
     except Exception, e:
         traceback.print_exc()
-    return 'unknown'
+        return 'unknown %s' % (str(e).encode('hex'),)
 
 __version__ = _get_version()
 
-DEBUG = False
+DEBUG = True