aboutsummaryrefslogtreecommitdiffstats
path: root/bin/srt
diff options
context:
space:
mode:
authorDavid Reyna <David.Reyna@windriver.com>2018-12-21 02:15:54 -0800
committerDavid Reyna <David.Reyna@windriver.com>2018-12-21 02:21:43 -0800
commit779c6d01e96ec093e34122cca94d7ec49538b02e (patch)
tree6b4a05671e86e05c161661a44dcce25cb4ebbc30 /bin/srt
parent9d20099f74153640b01059561213974e02c59ead (diff)
downloadsrtool-779c6d01e96ec093e34122cca94d7ec49538b02e.tar.gz
srtool-779c6d01e96ec093e34122cca94d7ec49538b02e.tar.bz2
srtool-779c6d01e96ec093e34122cca94d7ec49538b02e.zip
srtool: cummulative fixes 12/21/2018
Fixes: * Support Django development head in version check (e.g. '2.2.dev20181217100344') * Remove the single quotes around the comments content * Include Documentation/Export links for Guest users * Allow 'ip:port/acme' to link to 'acme_hello' Signed-off-by: David Reyna <David.Reyna@windriver.com>
Diffstat (limited to 'bin/srt')
-rwxr-xr-xbin/srt3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/srt b/bin/srt
index 49f3d1c1..87a506ae 100755
--- a/bin/srt
+++ b/bin/srt
@@ -119,7 +119,8 @@ verify_prereq() {
# expand version parts to 2 digits to support 1.10.x > 1.8
# (note:helper functions hard to insert in-line)
exp=$exp'import sys,django;'
- exp=$exp'version=["%02d" % int(n) for n in django.get_version().split(".")];'
+ # Allow for development versions like '2.2.dev20181217100344'
+ exp=$exp'version=["%02d" % int(n) for n in django.get_version().replace("dev","").split(".")];'
exp=$exp'vmin=["%02d" % int(n) for n in "\2".split(".")];'
exp=$exp'vmax=["%02d" % int(n) for n in "\4".split(".")];'
exp=$exp'sys.exit(not (version \1 vmin and version \3 vmax))'