Mercurial > hg > truffle

changeset 4248:c580db4d6f6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix mx.py for windows
author Andreas Woess <andreas.woess@jku.at>
date Mon, 09 Jan 2012 14:21:54 +0100
parents 3f6c6e61614e
children 0d28d08e1911
files mxtool/mx.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mxtool/mx.py	Mon Jan 09 14:12:53 2012 +0100
+++ b/mxtool/mx.py	Mon Jan 09 14:21:54 2012 +0100
@@ -568,7 +568,7 @@
     if _opts.verbose:
         log(' '.join(args))
         
-    if timeout is None and _opts.ptimeout != 0:
+    if timeout is None and hasattr(_opts, 'ptimeout') and _opts.ptimeout != 0:
         timeout = _opts.ptimeout
 
     global _currentSubprocess    
@@ -1249,7 +1249,7 @@
         
     c, _ = commands[command][:2]
     try:
-        if opts.timeout != 0:
+        if hasattr(opts, 'timeout') and opts.timeout != 0:
             def alarm_handler(signum, frame):
                 abort('Command timed out after ' + str(opts.timeout) + ' seconds: ' + ' '.join(commandAndArgs))
             signal.signal(signal.SIGALRM, alarm_handler)