Merge branch 'master' into develop

Conflicts:
	image_creator/version.py
	version

diff --git a/ChangeLog b/ChangeLog
index e560f16..dd3e87f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-18, v0.4.3
+       * Force TERM=linux when working on xterm. This makes dialog behave
+         better under OpenSUSE
+
 2013-07-17, v0.4.2
        * Fix a dialog bug affecting only OpenSUSE
 

diff --git a/docs/conf.py b/docs/conf.py
index ed3ced6..86eeb36 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.2'
+version = '0.4.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.4.2'
+release = '0.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 0834cb4..7895287 100644 (file)
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -199,6 +199,10 @@ def _dialog_form(self, text, height=20, width=60, form_height=15, fields=[],
 
 def main():
 
+    # In OpenSUSE dialog is buggy under xterm
+    if os.environ['TERM'] == 'xterm':
+        os.environ['TERM'] = 'linux'
+
     d = dialog.Dialog(dialog="dialog")
 
     # Add extra button in dialog library

diff --git a/image_creator/version.py b/image_creator/version.py
index 9991964..2026ff2 100644 (file)
--- a/image_creator/version.py
+++ b/image_creator/version.py
@@ -1,8 +1,8 @@
-
-__version__ = "0.4.2next"
+__version__ = "0.4.3"
 __version_vcs_info__ = {
-    'branch': 'develop',
-    'revid': '9d48081',
-    'revno': 325}
+    'branch': 'master',
+    'revid': '9f0e45e',
+    'revno': 319}
+>>>>>>> master
 __version_user_email__ = "skalkoto@grnet.gr"
 __version_user_name__ = "Nikos Skalkotos"

diff --git a/version b/version
index 99c7f86..17b2ccd 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.4.2next
+0.4.3