mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1054043 - Remove wrapcommand. r=ted
This code was only needed on osx 10.5, and the version string compare fails on osx 10.10.
This commit is contained in:
parent
912aa4c4ee
commit
796d21b80d
@ -217,7 +217,6 @@ class Automation(object):
|
||||
universal_newlines=False,
|
||||
startupinfo=None,
|
||||
creationflags=0):
|
||||
args = automationutils.wrapCommand(args)
|
||||
_log.info("INFO | automation.py | Launching: %s", subprocess.list2cmdline(args))
|
||||
subprocess.Popen.__init__(self, args, bufsize, executable,
|
||||
stdin, stdout, stderr,
|
||||
|
@ -26,7 +26,6 @@ __all__ = [
|
||||
"getDebuggerInfo",
|
||||
"DEBUGGER_INFO",
|
||||
"replaceBackSlashes",
|
||||
"wrapCommand",
|
||||
'KeyValueParseError',
|
||||
'parseKeyValue',
|
||||
'systemMemory',
|
||||
@ -402,19 +401,6 @@ def processLeakLog(leakLogFile, leakThreshold = 0):
|
||||
def replaceBackSlashes(input):
|
||||
return input.replace('\\', '/')
|
||||
|
||||
def wrapCommand(cmd):
|
||||
"""
|
||||
If running on OS X 10.5 or older, wrap |cmd| so that it will
|
||||
be executed as an i386 binary, in case it's a 32-bit/64-bit universal
|
||||
binary.
|
||||
"""
|
||||
if platform.system() == "Darwin" and \
|
||||
hasattr(platform, 'mac_ver') and \
|
||||
platform.mac_ver()[0][:4] < '10.6':
|
||||
return ["arch", "-arch", "i386"] + cmd
|
||||
# otherwise just execute the command normally
|
||||
return cmd
|
||||
|
||||
class KeyValueParseError(Exception):
|
||||
"""error when parsing strings of serialized key-values"""
|
||||
def __init__(self, msg, errors=()):
|
||||
|
Loading…
Reference in New Issue
Block a user