summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2011-03-21 16:24:52 -0400
committerScott Moser <smoser@ubuntu.com>2011-03-21 16:24:52 -0400
commit46631c678531500ff5685644874a1ae56ac90055 (patch)
tree141c15ede0ff3d828152e5bf7a8f3d66cb487dd1
parentde41d1f3141efce0ea01b5c04f36f3703cff1c30 (diff)
downloadvyos-cloud-init-46631c678531500ff5685644874a1ae56ac90055.tar.gz
vyos-cloud-init-46631c678531500ff5685644874a1ae56ac90055.zip
fix bug in part-handler code, that broke working part-handlers (LP: #739694)
LP: #739694
-rw-r--r--ChangeLog2
-rw-r--r--cloudinit/__init__.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fa5e1bc6..61cb6e70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
0.6.2:
- fix bug where update was not done unless update was explicitly set.
It would not be run if 'upgrade' or packages were set to be installed
+ - fix bug in part-handler code, that prevented working part-handlers
+ (LP: #739694)
0.6.1:
- fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509)
- improve comment strings in rsyslog file tools/21-cloudinit.conf
diff --git a/cloudinit/__init__.py b/cloudinit/__init__.py
index 7fc919fa..24e12d08 100644
--- a/cloudinit/__init__.py
+++ b/cloudinit/__init__.py
@@ -363,7 +363,7 @@ class CloudInit:
self.handlercount=self.handlercount+1
# write content to instance's handlerdir
- handlerdir = self.get_ipath("handler")
+ handlerdir = self.get_ipath("handlers")
modname = 'part-handler-%03d' % self.handlercount
modfname = modname + ".py"
util.write_file("%s/%s" % (handlerdir,modfname), payload, 0600)