Mercurial > hg > truffle

comparison mx/commands.py @ 11424:ece40b452e65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: Fix commands.vm when an explicit cwd is passed and no --vmcwd is given
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 26 Aug 2013 19:25:06 +0200
parents c355f6b32fa6
children 94779c895aad
comparison
equal deleted inserted replaced
11423:496cf245f023 11424:ece40b452e65
678 if vm is None: 678 if vm is None:
679 vm = _get_vm() 679 vm = _get_vm()
680 680
681 if cwd is None: 681 if cwd is None:
682 cwd = _vm_cwd 682 cwd = _vm_cwd
683 elif _vm_cwd != cwd: 683 elif _vm_cwd is not None and _vm_cwd != cwd:
684 mx.abort("conflicting working directories: do not set --vmcwd for this command") 684 mx.abort("conflicting working directories: do not set --vmcwd for this command")
685 685
686 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product' 686 build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product'
687 jdk = _jdk(build, vmToCheck=vm, installGraalJar=False) 687 jdk = _jdk(build, vmToCheck=vm, installGraalJar=False)
688 mx.expand_project_in_args(args) 688 mx.expand_project_in_args(args)