Merge lp:~harlowja/cloud-init/rework into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

=== modified file 'TODO'
--- TODO	2012-07-06 17:53:35 +0000
+++ TODO	2012-07-10 18:30:32 +0000
@@ -35,3 +35,12 @@
   something to remove later, and just recommend using 'chroot' instead (or the X 
   different other options which are similar to 'chroot'), which is might be more 
   natural and less confusing...
+- Instead of just warning when a module is being ran on a 'unknown' distribution
+  perhaps we should not run that module in that case? Or we might want to start
+  reworking those modules so they will run on all distributions? Or if that is
+  not the case, then maybe we want to allow fully specified python paths for
+  modules and start encouraging packages of 'ubuntu' modules, packages of 'rhel'
+  specific modules that people can add instead of having them all under the 
+  cloud-init 'root' tree? This might encourage more development of other modules
+  instead of having to go edit the cloud-init code to accomplish this.
+
 
=== modified file 'cloudinit/helpers.py'
--- cloudinit/helpers.py	2012-06-29 20:20:09 +0000
+++ cloudinit/helpers.py	2012-07-10 18:30:32 +0000
@@ -67,6 +67,9 @@
     def __init__(self, fn):
         self.fn = fn
 
+    def __str__(self):
+        return "<%s using file %r>" % (util.obj_name(self), self.fn)
+
 
 class FileSemaphores(object):
     def __init__(self, sem_path):
 
=== modified file 'cloudinit/util.py'
--- cloudinit/util.py	2012-07-09 19:08:27 +0000
+++ cloudinit/util.py	2012-07-10 18:30:32 +0000
@@ -828,7 +828,7 @@
     if _CLOUD_INIT_SAVE_STDIN is set in environment to a non empty or '0' value
     then input will not be closed (only useful potentially for debugging).
     """
-    if os.environ.get("_CLOUD_INIT_SAVE_STDIN") in ("", "0", 'False'):
+    if is_false(os.environ.get("_CLOUD_INIT_SAVE_STDIN")):
         return
     with open(os.devnull) as fp:
         os.dup2(fp.fileno(), sys.stdin.fileno())