comparison mxtool/mx.py @ 17236:9d728eb7fdec

mx: fixed regression in checking whether the JDK contains an optional library
author Doug Simon <doug.simon@oracle.com>
date Fri, 26 Sep 2014 23:21:15 +0200
parents fa8210d2ff06
children 86d9e456ef98
comparison
equal deleted inserted replaced
17235:fa8210d2ff06 17236:9d728eb7fdec
2134 def containsJar(self, jar): 2134 def containsJar(self, jar):
2135 if self._bootclasspath is None: 2135 if self._bootclasspath is None:
2136 self._init_classpaths() 2136 self._init_classpaths()
2137 2137
2138 for e in self._bootclasspath.split(os.pathsep): 2138 for e in self._bootclasspath.split(os.pathsep):
2139 if basename(e) == self.jar: 2139 if basename(e) == jar:
2140 return True 2140 return True
2141 for d in self._extdirs.split(os.pathsep): 2141 for d in self._extdirs.split(os.pathsep):
2142 if len(d) and self.jar in os.listdir(d): 2142 if len(d) and jar in os.listdir(d):
2143 return True 2143 return True
2144 for d in self._endorseddirs.split(os.pathsep): 2144 for d in self._endorseddirs.split(os.pathsep):
2145 if len(d) and self.jar in os.listdir(d): 2145 if len(d) and jar in os.listdir(d):
2146 return True 2146 return True
2147 return False 2147 return False
2148 2148
2149 def check_get_env(key): 2149 def check_get_env(key):
2150 """ 2150 """