Mercurial > hg > truffle

changeset 18636:dcf5cd3c6da9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mx: fixed issue with calling abort() before _opts is defined
author Doug Simon <doug.simon@oracle.com>
date Fri, 05 Dec 2014 11:00:19 +0100
parents a8b46348b79f
children d5d1fbe270e9
files mxtool/mx.py
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Fri Dec 05 08:20:06 2014 +0100
+++ b/mxtool/mx.py	Fri Dec 05 11:00:19 2014 +0100
@@ -1673,6 +1673,9 @@
 
         opts = self.parse_args()
 
+        global _opts
+        _opts = opts
+
         # Give the timeout options a default value to avoid the need for hasattr() tests
         opts.__dict__.setdefault('timeout', 0)
         opts.__dict__.setdefault('ptimeout', 0)
@@ -2209,7 +2212,7 @@
     the object's value is printed and the exit status is one.
     """
 
-    if _opts.killwithsigquit:
+    if _opts and _opts.killwithsigquit:
         _send_sigquit()
 
     def is_alive(p):
@@ -5177,9 +5180,9 @@
         abort('no primary suite found')
 
     opts, commandAndArgs = _argParser._parse_cmd_line()
-
-    global _opts, _java_homes
-    _opts = opts
+    assert _opts == opts
+
+    global _java_homes
     defaultJdk = JavaConfig(opts.java_home, opts.java_dbg_port)
     _java_homes = [defaultJdk]
     if opts.extra_java_homes: