From 28f413f223ae2b8a1870d4a6c8ff9413aae4c2ee Mon Sep 17 00:00:00 2001
From: Edison Su <edison@cloud.com>
Date: Tue, 5 Jul 2011 16:19:23 -0700
Subject: [PATCH] fix meta issue for vmware: create a blank meta data file,
 even meta data is empty

---
 .../systemvm/debian/config/root/userdata.py   | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/patches/systemvm/debian/config/root/userdata.py b/patches/systemvm/debian/config/root/userdata.py
index 1d8b5342069..50c5e6e8a15 100644
--- a/patches/systemvm/debian/config/root/userdata.py
+++ b/patches/systemvm/debian/config/root/userdata.py
@@ -42,24 +42,26 @@ def vm_data(args):
         
         fd = None
         tmp_path = None
-        if (vmDataValue != "none"):
-            try:
-                fd,tmp_path = tempfile.mkstemp()
-                tmpfile = open(tmp_path, 'w')
+       
+        try:
+            fd,tmp_path = tempfile.mkstemp()
+            tmpfile = open(tmp_path, 'w')
 
-                if (vmDataFolder == "userdata"):
-                    vmDataValue = base64.urlsafe_b64decode(vmDataValue)
-                    
+            if (vmDataFolder == "userdata" and vmDataValue != "none"):
+                vmDataValue = base64.urlsafe_b64decode(vmDataValue)
+            
+            if vmDataValue != "none":
                 tmpfile.write(vmDataValue)
-                tmpfile.close()
-                cmd.append("-d")
-                cmd.append(tmp_path)
-            except:
-		if (fd !=None):
-                	os.close(fd)
-                	os.remove(tmp_path)
+            
+            tmpfile.close()
+            cmd.append("-d")
+            cmd.append(tmp_path)
+        except:
+            if fd !=None:
+                os.close(fd)
+                os.remove(tmp_path)
                 return ''
-
+        
         try:
             call(cmd)
             txt = 'success'