Mercurial > hg > truffle

changeset 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 496cf245f023
children decad422aa0c
files mx/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mx/commands.py	Mon Aug 26 18:06:06 2013 +0200
+++ b/mx/commands.py	Mon Aug 26 19:25:06 2013 +0200
@@ -680,7 +680,7 @@
 
     if cwd is None:
         cwd = _vm_cwd
-    elif _vm_cwd != cwd:
+    elif _vm_cwd is not None and _vm_cwd != cwd:
         mx.abort("conflicting working directories: do not set --vmcwd for this command")
 
     build = vmbuild if vmbuild is not None else _vmbuild if _vmSourcesAvailable else 'product'