summaryrefslogtreecommitdiff
path: root/indra/lib
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-06-29 20:32:13 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-06-29 20:32:13 +0300
commita7c9ca896069ce84d8c9798e36a5fc75d5ac9939 (patch)
tree404e59ab738fe61d42bfc9780c4d8fa8bb25f423 /indra/lib
parent10ab905c96bf979827951146d22e98214bf5a310 (diff)
parent1e4f2ec07e32a142f35817d3186a124df3f8cd25 (diff)
Merge branch 'master' into DRTVWR-561-maint-O
Diffstat (limited to 'indra/lib')
-rwxr-xr-xindra/lib/python/indra/util/llmanifest.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index aedd3b7ee4..5b277846b7 100755
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -83,8 +83,7 @@ def proper_windows_path(path, current_platform = sys.platform):
return drive_letter.upper() + ':\\' + rel.replace('/', '\\')
def get_default_platform(dummy):
- return {'linux2':'linux',
- 'linux1':'linux',
+ return {'linux':'linux',
'cygwin':'windows',
'win32':'windows',
'darwin':'darwin'