[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.0.0-3-g2a0dbf7
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:28 CET 2014
The branch, build-baikal has been updated
via 2a0dbf79544067af78035c031a2c59180c54a463 (commit)
from 10f96848a9397525e5887d05426fd8a69a5be4d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 8 ++++++++
debian/control | 3 ++-
x2go/__init__.py | 2 +-
x2go/utils.py | 5 ++++-
4 files changed, 15 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 78c19a2..d712e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+python-x2go (0.1.0.1-0~x2go1) unstable; urgency=low
+
+ * new upstream version (bugfix release 0.1.0.1):
+ - fixes encoding problem on systems that cannot provide an encoding type
+ * adds locales as dependency
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 27 May 2011 13:07:23 +0200
+
python-x2go (0.1.0.0-0~x2go1) unstable; urgency=low
* new upstream version (0.1.0.0):
diff --git a/debian/control b/debian/control
index 0eb2906..519063e 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,8 @@ Build-Depends:
python-support,
python-epydoc,
python-gevent,
- python-paramiko
+ python-paramiko,
+ locales
#texlive-latex-base,
#texlive-latex-extra,
#texlive-fonts-recommended
diff --git a/x2go/__init__.py b/x2go/__init__.py
index 4e6f237..9950745 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -158,7 +158,7 @@ Contact
"""
__NAME__ = 'python-x2go'
-__VERSION__ = '0.1.0.0'
+__VERSION__ = '0.1.0.1'
from gevent import monkey
monkey.patch_all()
diff --git a/x2go/utils.py b/x2go/utils.py
index ffb1c62..bab3c58 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -356,7 +356,10 @@ def get_encoding():
try:
encoding = locale.getdefaultlocale()[1]
except:
- encoding = sys.getdefaultencoding()
+ try:
+ encoding = sys.getdefaultencoding()
+ except:
+ encoding = 'ascii'
return encoding
def is_abs_path(path):
hooks/post-receive
--
python-x2go.git (Python X2Go Client API)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).
More information about the x2go-commits
mailing list