Mercurial > hg > truffle

diff mx/commands.py @ 11432:565724c714a7

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 Mon, 26 Aug 2013 21:38:44 +0200
parents ece40b452e65
children 94779c895aad
line wrap: on
line diff
--- a/mx/commands.py	Mon Aug 26 21:38:10 2013 +0200
+++ b/mx/commands.py	Mon Aug 26 21:38:44 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'