From 2b450d23ea0553e4129eb593fff6f16bb00369ee Mon Sep 17 00:00:00 2001
From: Michael Wild <themiwi@users.sourceforge.net>
Date: Sun, 11 Dec 2011 14:18:36 +0100
Subject: [PATCH] FIX: Unhide cursor in data/python/FreeFOAM/tutorial.py

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
---
 data/python/FreeFOAM/tutorial.py | 83 +++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/data/python/FreeFOAM/tutorial.py b/data/python/FreeFOAM/tutorial.py
index 45f3aa973..77fc67431 100644
--- a/data/python/FreeFOAM/tutorial.py
+++ b/data/python/FreeFOAM/tutorial.py
@@ -253,50 +253,53 @@ class CaseRunner(object):
       fmt = '    %%-%ds  ${HIDE_CURSOR}'%max(
             30, max(map(len, self._stepnames)))
       last = self._stepnames.index(step)
-      for i, s in enumerate(self._stepnames):
-         if not verbose:
-            _fu.cecho(fmt%s, end='')
-         sys.stdout.flush()
-         stamp = _op.join(case_dir, self._steps[s]['stamp'])
-         do_skip = False
-         if test_mode and self._steps[s]['skip_test']:
-            do_skip = True
-         else:
-            if i > last:
-               do_skip = True
-            elif _op.isfile(stamp):
-               do_skip = True
-               if i > 0:
-                  old_s = self._stepnames[i-1]
-                  old_stamp = _op.join(
-                        case_dir, self._steps[old_s]['stamp'])
-                  if _op.getmtime(old_stamp) > _op.getmtime(stamp):
-                     do_skip = False
-         if do_skip:
+      try:
+         for i, s in enumerate(self._stepnames):
             if not verbose:
-               _fu.cecho('${YELLOW}[ SKIP ]${NORMAL}')
-            continue
-
-         try:
-            if verbose:
-               stamp_file = _fu.Tee(stamp, 'wt')
+               _fu.cecho(fmt%s, end='')
+            sys.stdout.flush()
+            stamp = _op.join(case_dir, self._steps[s]['stamp'])
+            do_skip = False
+            if test_mode and self._steps[s]['skip_test']:
+               do_skip = True
             else:
-               stamp_file = open(stamp, 'wt')
-            stat = self._steps[s]['cmd'](case_dir, stamp_file, test_mode)
-            if not verbose:
-               if stat:
-                  _fu.cecho('${GREEN}[  OK  ]${NORMAL}')
+               if i > last:
+                  do_skip = True
+               elif _op.isfile(stamp):
+                  do_skip = True
+                  if i > 0:
+                     old_s = self._stepnames[i-1]
+                     old_stamp = _op.join(
+                           case_dir, self._steps[old_s]['stamp'])
+                     if _op.getmtime(old_stamp) > _op.getmtime(stamp):
+                        do_skip = False
+            if do_skip:
+               if not verbose:
+                  _fu.cecho('${YELLOW}[ SKIP ]${NORMAL}')
+               continue
+
+            try:
+               if verbose:
+                  stamp_file = _fu.Tee(stamp, 'wt')
                else:
+                  stamp_file = open(stamp, 'wt')
+               stat = self._steps[s]['cmd'](case_dir, stamp_file, test_mode)
+               if not verbose:
+                  if stat:
+                     _fu.cecho('${GREEN}[  OK  ]${NORMAL}')
+                  else:
+                     _fu.cecho('${RED}${BOLD}[FAILED]${NORMAL}')
+            except BaseException, e:
+               if not verbose:
                   _fu.cecho('${RED}${BOLD}[FAILED]${NORMAL}')
-         except BaseException, e:
-            if not verbose:
-               _fu.cecho('${RED}${BOLD}[FAILED]${NORMAL}')
-            _fu.cerror("Step %s in case %s raised an exception:\n%s"%
-                  (s, case_dir, str(e)), file=sys.stderr)
-            stat = False
-            raise
-         if not stat:
-            break
+               _fu.cerror("Step %s in case %s raised an exception:\n%s"%
+                     (s, case_dir, str(e)), file=sys.stderr)
+               stat = False
+               raise
+            if not stat:
+               break
+      finally:
+         _fu.cecho('${SHOW_CURSOR}', end='')
       return stat
 
    def clean(self):
-- 
2.11.4.GIT