Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions startup.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,15 @@ def scan_software(self):

def _find_software(self):

# Support Python 3.3+.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m not really sure if this change is related to the PR https://github.com/shotgunsoftware/tk-core/pull/1037/files, and therefore whether it’s actually necessary.

# Platform value for linux changed from "linux2" to "linux".
platform = sys.platform
if platform == 'linux':
platform = 'linux2'

# all the executable templates for the current OS
executable_templates = self.EXECUTABLE_TEMPLATES.get(sys.platform, [])
executable_regexp = self.COMPONENT_REGEX_LOOKUP.get(sys.platform, [])
executable_templates = self.EXECUTABLE_TEMPLATES.get(platform, [])
executable_regexp = self.COMPONENT_REGEX_LOOKUP.get(platform, [])

# all the discovered executables
sw_versions = []
Expand Down