Merge branch 'master' into debian-precise

diff --git a/Changelog b/Changelog
index 2b3243f..eb1d6ce 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+Changelog for 0.12.9
+
+- Bugfix: --unpublish didn't work in kamaki image modify
+
 Changelog for 0.12.8
 
 - Fix image property-del bug (made it a required argument of image modify) [#4940]

diff --git a/kamaki/cli/commands/image.py b/kamaki/cli/commands/image.py
index ba0dcb5..241fbd2 100644 (file)
--- a/kamaki/cli/commands/image.py
+++ b/kamaki/cli/commands/image.py
@@ -361,7 +361,7 @@ class image_modify(_init_image, _optional_output_cmd):
             disk_format=self['disk_format'],
             container_format=self['container_format'],
             status=self['status'],
-            public=self['publish'] or self['unpublish'] or None,
+            public=self['publish'] or (False if self['unpublish'] else None),
             **meta['properties']))
         if self['with_output']:
             self._optional_output(self.get_image_details(image_id))

diff --git a/version b/version
index 7bfd836..0de787f 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.12.8
+0.12.9