summaryrefslogtreecommitdiff
path: root/indra/lib
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-14 19:52:09 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2022-02-14 19:52:09 +0200
commitf695a5d1a8098fd3bfd4aa3f7f77a4bbaa39bf57 (patch)
tree43c719e17425aad3ca3b657a841eb5185d489cd2 /indra/lib
parentee0d2648e8b708d48389f7100ed0003bc2da81a2 (diff)
SL-15742 Return correct default platform for linux
Since python 3.3 sys.platform for Linux will always be 'linux'. See https://bugs.python.org/issue12326 - fix by NickyD
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 4bc70b2ca4..213bc96bc6 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'