git://git.onelab.eu
/
myslice.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d23068e
)
portal_version without hash
author
Loic Baron
<loic.baron@lip6.fr>
Wed, 13 May 2015 09:49:40 +0000
(11:49 +0200)
committer
Loic Baron
<loic.baron@lip6.fr>
Wed, 13 May 2015 09:49:40 +0000
(11:49 +0200)
myslice/settings.py
patch
|
blob
|
history
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
0caee25
..
b01b565
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-31,7
+31,8
@@
except:
if not config.myslice.portal_version:
try:
if not config.myslice.portal_version:
try:
- PORTAL_VERSION = subprocess.check_output(["git", "--git-dir", ROOT + "/.git", "describe"])
+ v = subprocess.check_output(["git", "--git-dir", ROOT + "/.git", "describe"])
+ PORTAL_VERSION = '-'.join(v.split('-')[:-1])
except:
PORTAL_VERSION = 'not using git'
except:
PORTAL_VERSION = 'not using git'