summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-09 12:04:31 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-09 12:04:31 -0300
commit4983b0793275ace0dbc49428291324a1eb4e5aa3 (patch)
treea2d471486a5dddcaf0800913531f7a68f8f0b483 /src
parent65fd449bdaeca67ab3b361dcee5f72729f207bb7 (diff)
parent0635f067d5c5b4c186abe7de4d8e692ad09a1416 (diff)
Merge remote-tracking branch 'ivan/feature/3421_update-docs' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/_version.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/leap/_version.py b/src/leap/_version.py
index 6f7e3d05..05542975 100644
--- a/src/leap/_version.py
+++ b/src/leap/_version.py
@@ -16,6 +16,8 @@ git_full = "$Format:%H$"
import subprocess
import sys
+import re
+import os.path
def run_command(args, cwd=None, verbose=False):
@@ -38,11 +40,6 @@ def run_command(args, cwd=None, verbose=False):
return stdout
-import sys
-import re
-import os.path
-
-
def get_expanded_variables(versionfile_source):
# the code embedded in _version.py can just fetch the value of these
# variables. When used from setup.py, we don't want to import
@@ -187,7 +184,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source,
return {"version": dirname[len(parentdir_prefix):], "full": ""}
tag_prefix = ""
-parentdir_prefix = "leap_client-"
+parentdir_prefix = "bitmask-"
versionfile_source = "src/leap/_version.py"