From 788a3bfb0165caacade779a5b99891e04cdf7123 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@nelson>
Date: Fri, 8 Jan 2010 00:11:07 -0500
Subject: fixes found testing in ec2

---
 ec2init/__init__.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'ec2init/__init__.py')

diff --git a/ec2init/__init__.py b/ec2init/__init__.py
index d9d24969..a0ef24c2 100644
--- a/ec2init/__init__.py
+++ b/ec2init/__init__.py
@@ -80,7 +80,7 @@ class EC2Init:
                 s = source()
                 if s.get_data():
                     self.datasource = s
-                    return
+                    return True
             except Exception as e:
                 pass
         raise Exception("Could not find data source")
@@ -93,13 +93,8 @@ class EC2Init:
         self.store_userdata()
 
     def store_userdata(self):
-        f = open(userdata_raw,"wb")
-        f.write(self.datasource.get_userdata_raw())
-        f.close()
-
-        f = open(userdata,"wb")
-        f.write(self.get_userdata())
-        f.close()
+        write_file(userdata_raw, self.datasource.get_userdata_raw(), 0644)
+        write_file(userdata, self.datasource.get_userdata(), 0644)
 
     def get_cfg_option_bool(self, key, default=None):
         val = self.config.get(key, default)
-- 
cgit v1.2.3