diff -Nru cloud-init-0.6.3/debian/changelog cloud-init-0.6.3/debian/changelog --- cloud-init-0.6.3/debian/changelog 2014-03-21 09:47:40.000000000 -0600 +++ cloud-init-0.6.3/debian/changelog 2014-04-03 16:27:41.000000000 -0600 @@ -1,3 +1,10 @@ +cloud-init (0.6.3-0ubuntu1.13) precise-proposed; urgency=medium + + * debian/patches/lp-1302229-fix_futils_azure.patch: fix import statement + for util to futil in Windows Azure Datasource (LP: #1302229) + + -- Ben Howard Thu, 03 Apr 2014 16:26:50 -0600 + cloud-init (0.6.3-0ubuntu1.12) precise-proposed; urgency=low * debian/patches/lp-1269626-azure_new_instance.patch: fix handling of new diff -Nru cloud-init-0.6.3/debian/patches/lp-1302229-fix_futils_azure.patch cloud-init-0.6.3/debian/patches/lp-1302229-fix_futils_azure.patch --- cloud-init-0.6.3/debian/patches/lp-1302229-fix_futils_azure.patch 1969-12-31 17:00:00.000000000 -0700 +++ cloud-init-0.6.3/debian/patches/lp-1302229-fix_futils_azure.patch 2014-04-03 16:26:21.000000000 -0600 @@ -0,0 +1,15 @@ +Author: Ben Howard +Bug: https://launchpad.net/bugs/1302229 +Applied-Upstream: yes +Description: Fix util import to use futil +--- a/cloudinit/DataSourceAzure.py ++++ b/cloudinit/DataSourceAzure.py +@@ -285,7 +285,7 @@ + # to have a false positive. so just unmount and then check. + try: + util.subp(['umount', device]) +- except util.ProcessExecutionError as e: ++ except futil.ProcessExecutionError as e: + if device in util.mounts(): + LOG.warn("Failed to unmount %s, will not reformat.", device) + LOG.debug("Failed umount: %s", e) diff -Nru cloud-init-0.6.3/debian/patches/series cloud-init-0.6.3/debian/patches/series --- cloud-init-0.6.3/debian/patches/series 2014-03-21 09:44:08.000000000 -0600 +++ cloud-init-0.6.3/debian/patches/series 2014-04-03 16:25:02.000000000 -0600 @@ -21,3 +21,4 @@ lp-1244355-cloudarchive.patch lp-1269626-azure_new_instance.patch lp-1292648-azure-format-ephemeral-new.patch +lp-1302229-fix_futils_azure.patch