# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1428398379 -7200
# Node ID 8dec9eea31866712f25a56fc15a6a14ee2c0256a
# Parent  2c6fb59b484ff026b9bfb7b24a7be018c010f037
mx: Avoid listing directories that do not exist while looking for JDKs

diff -r 2c6fb59b484f -r 8dec9eea3186 mxtool/mx.py
--- a/mxtool/mx.py	Wed Apr 08 11:29:36 2015 +0200
+++ b/mxtool/mx.py	Tue Apr 07 11:19:39 2015 +0200
@@ -1674,18 +1674,23 @@
     candidateJdks = []
     if get_os() == 'darwin':
         base = '/Library/Java/JavaVirtualMachines'
-        candidateJdks = [join(base, n, 'Contents/Home') for n in os.listdir(base) if exists(join(base, n, 'Contents/Home'))]
+        if exists(base):
+            candidateJdks = [join(base, n, 'Contents/Home') for n in os.listdir(base) if exists(join(base, n, 'Contents/Home'))]
     elif get_os() == 'linux':
         base = '/usr/lib/jvm'
-        candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
+        if exists(base):
+            candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
         base = '/usr/java'
-        candidateJdks += [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
+        if exists(base):
+            candidateJdks += [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
     elif get_os() == 'solaris':
         base = '/usr/jdk/instances'
-        candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
+        if exists(base):
+            candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, 'jre/lib/rt.jar'))]
     elif get_os() == 'windows':
         base = r'C:\Program Files\Java'
-        candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, r'jre\lib\rt.jar'))]
+        if exists(base):
+            candidateJdks = [join(base, n) for n in os.listdir(base) if exists(join(base, n, r'jre\lib\rt.jar'))]
 
     javaHome = None
     if len(candidateJdks) != 0: