summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-16 14:53:38 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-16 14:53:38 -0300
commita28654cae3dd19dd7c73693b19ee26d437de5ddf (patch)
treea630349bbcab91550d34ce7f85ff4dcaa6102ef1 /server/src
parent3a5f090e79c65c063fbe2428248b34c1f43b914f (diff)
parent45241ec8618d24b61b768bc7027473b52945609f (diff)
Merge remote-tracking branch 'refs/remotes/kali/feature/patch-reported-version' into develop
Diffstat (limited to 'server/src')
-rw-r--r--server/src/leap/soledad/server/_version.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/server/src/leap/soledad/server/_version.py b/server/src/leap/soledad/server/_version.py
index 589d42d2..ec611c39 100644
--- a/server/src/leap/soledad/server/_version.py
+++ b/server/src/leap/soledad/server/_version.py
@@ -128,7 +128,16 @@ def versions_from_vcs(tag_prefix, versionfile_source, verbose=False):
for i in range(len(versionfile_source.split("/"))):
root = os.path.dirname(root)
else:
- root = os.path.dirname(here)
+ root = os.path.dirname(
+ os.path.join('..', here))
+
+ ######################################################
+ # XXX patch for our specific configuration with
+ # the three projects leap.soledad.{common, client, server}
+ # inside the same repo.
+ ######################################################
+ root = os.path.dirname(os.path.join('..', root))
+
if not os.path.exists(os.path.join(root, ".git")):
if verbose:
print("no .git in %s" % root)