Commit c7ac799e authored by Nikos Skalkotos's avatar Nikos Skalkotos
Browse files

Merge branch 'master' into debian-wheezy

parents 0378a22f a8943421
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
......
......@@ -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.
......
......@@ -326,6 +326,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
......@@ -537,6 +538,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:
......@@ -586,6 +588,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
......@@ -659,6 +662,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
......
__version__ = "0.4.1"
__version_info__ = ['0', '4', '1']
__version__ = "0.4.2"
__version_info__ = ['0', '4', '2']
__version_vcs_info__ = {
'branch': 'master',
'revid': '628054a',
'revno': 313}
'revid': '6223cd7',
'revno': 316}
__version_user_info__ = "skalkoto@darkstar.admin.grnet.gr"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment