Merge master into develop

Conflicts:
	docs/conf.py
	image_creator/version.py
	version

diff --git a/ChangeLog b/ChangeLog
index 586fd3f..e560f16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-17, v0.4.2
+       * Fix a dialog bug affecting only OpenSUSE
+
+2013-06-21, v0.4.1
+       * Fix a bug that caused an abnormal termination when trying to
+         determine the available users in a Windows image
+
 2013-06-21, v0.4
        * Populate the USERS metadata in Windows images
        * Support kamaki 0.9 and synnefo 0.14

diff --git a/docs/conf.py b/docs/conf.py
index 4d729c8..ed3ced6 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -50,9 +50,9 @@ copyright = u'2012, 2013 GRNET S.A. All rights reserved'
 # built documents.
 #
 # The short X.Y version.
-version = '0.4.1'
+version = '0.4.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.1'
+release = '0.4.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index 11045c1..a6228db 100644 (file)
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -327,6 +327,7 @@ def delete_clouds(session):
 
     (code, to_delete) = d.checklist("Choose which cloud accounts to delete:",
                                     choices=choices, width=WIDTH)
+    to_delete = map(lambda x: x.strip('"'), to_delete)  # Needed for OpenSUSE
 
     if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
         return False
@@ -538,6 +539,7 @@ def delete_properties(session):
 
     (code, to_delete) = d.checklist("Choose which properties to delete:",
                                     choices=choices, width=WIDTH)
+    to_delete = map(lambda x: x.strip('"'), to_delete)  # needed for OpenSUSE
 
     # If the user exits with ESC or CANCEL, the returned tag list is empty.
     for i in to_delete:
@@ -587,6 +589,7 @@ def exclude_tasks(session):
             choices=choices, height=19, list_height=8, width=WIDTH,
             help_button=1, extra_button=1, extra_label="No Config",
             title="Exclude Configuration Tasks")
+        tags = map(lambda x: x.strip('"'), tags)  # Needed for OpenSUSE
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
@@ -661,6 +664,7 @@ def sysprep(session):
             "run on the image. Press <Help> to see details about the system "
             "preparation tasks.", title="Run system preparation tasks",
             choices=choices, width=70, ok_label="Run", help_button=1)
+        tags = map(lambda x: x.strip('"'), tags)  # Needed for OpenSUSE
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False

diff --git a/image_creator/version.py b/image_creator/version.py
index 1d12d75..8277b72 100644 (file)
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,7 +1,7 @@
-__version__ = "0.4.1next"
-__version_info__ = ['0', '4', '1next']
+__version__ = "0.4.2"
+__version_info__ = ['0', '4', '2']
 __version_vcs_info__ = {
-    'branch': 'develop',
-    'revid': 'ae887b5',
-    'revno': 314}
+    'branch': 'master',
+    'revid': '6223cd7',
+    'revno': 316}
 __version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"

diff --git a/version b/version
index d609276..2b7c5ae 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.1next
+0.4.2