# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1377537906 -7200
# Node ID ece40b452e6596ed5fbbe12679f31dc876b4f03f
# Parent  496cf245f023445c0f72b9c84185791adb8be165
mx: Fix commands.vm when an explicit cwd is passed and no --vmcwd is given

diff -r 496cf245f023 -r ece40b452e65 mx/commands.py
--- 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'