Mercurial > hg > truffle

comparison mxtool/mx.py @ 15697:e563b7668db5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Doug Simon <doug.simon@oracle.com>
date Thu, 15 May 2014 23:12:48 +0200
parents 807090ddbbf2 5ec52f033e58
children 16059f6f5661
comparison
equal deleted inserted replaced
15696:5f1373b3527d 15697:e563b7668db5
601 601
602 includedInJDK = getattr(self, 'includedInJDK', None) 602 includedInJDK = getattr(self, 'includedInJDK', None)
603 if includedInJDK and java().javaCompliance >= JavaCompliance(includedInJDK): 603 if includedInJDK and java().javaCompliance >= JavaCompliance(includedInJDK):
604 return None 604 return None
605 605
606 return _download_file_with_sha1(self.name, path, self.urls, self.sha1, sha1path, resolve, self.optional) 606 return _download_file_with_sha1(self.name, path, self.urls, self.sha1, sha1path, resolve, not self.optional)
607 607
608 def get_source_path(self, resolve): 608 def get_source_path(self, resolve):
609 if self.sourcePath is None: 609 if self.sourcePath is None:
610 return None 610 return None
611 path = _make_absolute(self.sourcePath, self.suite.dir) 611 path = _make_absolute(self.sourcePath, self.suite.dir)