aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/easy_install.py
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2012-11-27 00:44:17 +0100
committerArfrever Frehtes Taifersar Arahesis <Arfrever.FTA@GMail.Com>2012-11-27 00:44:17 +0100
commit11491404365ba925bb36935a9f7a14c1afe003cc (patch)
tree5ef291cac4a3db9a1c69c18c0adfc8915f563d13 /setuptools/command/easy_install.py
parent753f783100cf598316e9030dcf59b24772819504 (diff)
downloadexternal_python_setuptools-11491404365ba925bb36935a9f7a14c1afe003cc.tar.gz
external_python_setuptools-11491404365ba925bb36935a9f7a14c1afe003cc.tar.bz2
external_python_setuptools-11491404365ba925bb36935a9f7a14c1afe003cc.zip
Disable workaround for Jython scripts on Linux systems.
--HG-- branch : distribute extra : rebase_source : 289980b084c335029d93732feb8e02da94472795
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-xsetuptools/command/easy_install.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 337532bc..cb911173 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -1788,6 +1788,11 @@ def chmod(path, mode):
def fix_jython_executable(executable, options):
if sys.platform.startswith('java') and is_sh(executable):
+ # Workaround for Jython is not needed on Linux systems.
+ import java
+ if java.lang.System.getProperty("os.name") == "Linux":
+ return executable
+
# Workaround Jython's sys.executable being a .sh (an invalid
# shebang line interpreter)
if options: