From 526837e1c16e7d5ced40bea6463e58641c94ba05 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 18 Jun 2010 09:21:31 -0700
Subject: [PATCH] Move serverConnection.terminate() back into the finally

(Bitbake rev: 58e1b0a5dbd0f1ca137ad7ed1bd7ad9975a20fb7)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 bitbake/bin/bitbake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 2fe9c79054..54228518d7 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -206,8 +206,9 @@ Default BBFILES are the .bb files in the current directory.""")
         except Exception, e:
             print "FATAL: Unable to start to '%s' UI: %s" % (ui, e)
             raise
+    finally:
+        serverConnection.terminate()
 
-    serverConnection.terminate()
     return return_value
 
 if __name__ == "__main__":