[svn r3651] fix handling of Jython environments that use a jython-complete.jar

2 files changed, 9 insertions, 2 deletions

diff --git a/docs/index.txt b/docs/index.txt
index 121797a..05fa91d 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -322,6 +322,9 @@ svn trunk
 * Sometimes Cygwin seems to leave ``.exe`` off ``sys.executable``; a
   workaround is added.
 
+* Fixed handling of Jython environments that use a
+  jython-complete.jar.
+
 1.3
 ~~~
 
diff --git a/virtualenv.py b/virtualenv.py
index 5b992cf..91aa598 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -556,8 +556,12 @@ def create_environment(home_dir, site_packages=True, clear=False,
             copyfile(join(exec_dir, fn), join(lib_dir, fn))
     
     if is_jython:
-        for name in 'jython.jar', 'javalib':
-            copyfile(join(prefix, name), join(home_dir, name))
+        # Jython has either jython.jar and javalib/ dir, or just
+        # jython-complete.jar
+        for name in 'jython.jar', 'javalib', 'jython-complete.jar':
+            src = join(prefix, name)
+            if os.path.exists(src):
+                copyfile(src, join(home_dir, name))
         copyfile(join(prefix, 'cachedir'), join(home_dir, 'cachedir'),
                  symlink=False)