From d52feae7ad38670964edebb0eea5db2c8c80f760 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Wed, 25 Mar 2015 15:54:19 +0000
Subject: Ensure that the serial console is always closed.

---
 cloudinit/sources/DataSourceSmartOS.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'cloudinit/sources/DataSourceSmartOS.py')

diff --git a/cloudinit/sources/DataSourceSmartOS.py b/cloudinit/sources/DataSourceSmartOS.py
index 61dd044f..237fc140 100644
--- a/cloudinit/sources/DataSourceSmartOS.py
+++ b/cloudinit/sources/DataSourceSmartOS.py
@@ -30,9 +30,11 @@
 #       Comments with "@datadictionary" are snippets of the definition
 
 import binascii
+import contextlib
 import os
 import random
 import re
+
 import serial
 
 from cloudinit import log as logging
@@ -371,11 +373,10 @@ def query_data(noun, seed_device, seed_timeout, strip=False, default=None,
     if not noun:
         return False
 
-    ser = get_serial(seed_device, seed_timeout)
+    with contextlib.closing(get_serial(seed_device, seed_timeout)) as ser:
+        client = JoyentMetadataClient(ser)
+        response = client.get_metadata(noun)
 
-    client = JoyentMetadataClient(ser)
-    response = client.get_metadata(noun)
-    ser.close()
     if response is None:
         return default
 
-- 
cgit v1.2.3