cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/strip-iid-newline into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/strip-iid-newline/+merge/208028
-- 
https://code.launchpad.net/~harlowja/cloud-init/strip-iid-newline/+merge/208028
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/strip-iid-newline into lp:cloud-init.

=== modified file 'cloudinit/sources/DataSourceConfigDrive.py'
--- cloudinit/sources/DataSourceConfigDrive.py	2014-02-08 21:16:07 +0000
+++ cloudinit/sources/DataSourceConfigDrive.py	2014-02-24 22:35:28 +0000
@@ -181,7 +181,7 @@
     # hasn't declared itself found.
     fname = os.path.join(paths.get_cpath('data'), 'instance-id')
     try:
-        return util.load_file(fname)
+        return util.load_file(fname).strip()
     except IOError:
         return None