diff options
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/lib/python/indra/util/llversion.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linden/indra/lib/python/indra/util/llversion.py b/linden/indra/lib/python/indra/util/llversion.py index cf4f3c6..666cce4 100644 --- a/linden/indra/lib/python/indra/util/llversion.py +++ b/linden/indra/lib/python/indra/util/llversion.py | |||
@@ -45,15 +45,12 @@ def get_version_file_contents(version_type): | |||
45 | 45 | ||
46 | def get_version(version_type): | 46 | def get_version(version_type): |
47 | file_str = get_version_file_contents(version_type) | 47 | file_str = get_version_file_contents(version_type) |
48 | m = re.search('const S32 LL_VERSION_MAJOR = (\d+);', file_str) | 48 | m = re.search('const S32 IMP_VERSION_MAJOR = (\d+);', file_str) |
49 | VER_MAJOR = m.group(1) | 49 | VER_MAJOR = m.group(1) |
50 | m = re.search('const S32 LL_VERSION_MINOR = (\d+);', file_str) | 50 | m = re.search('const S32 IMP_VERSION_MINOR = (\d+);', file_str) |
51 | VER_MINOR = m.group(1) | 51 | VER_MINOR = m.group(1) |
52 | m = re.search('const S32 LL_VERSION_PATCH = (\d+);', file_str) | 52 | m = re.search('const S32 IMP_VERSION_PATCH = (\d+);', file_str) |
53 | VER_PATCH = m.group(1) | 53 | version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s" % locals() |
54 | m = re.search('const S32 LL_VERSION_BUILD = (\d+);', file_str) | ||
55 | VER_BUILD = m.group(1) | ||
56 | version = "%(VER_MAJOR)s.%(VER_MINOR)s.%(VER_PATCH)s.%(VER_BUILD)s" % locals() | ||
57 | return version | 54 | return version |
58 | 55 | ||
59 | def get_channel(version_type): | 56 | def get_channel(version_type): |