[X2Go-Commits] python-x2go.git - build-baikal (branch) updated: 0.1.1.0-2-g6c668be
X2Go dev team
git-admin at x2go.org
Wed Jan 8 15:30:35 CET 2014
The branch, build-baikal has been updated
via 6c668be841fe6a1b95dff2f1fbdeb6bfb8159879 (commit)
from 1f32d849f01fd51ead168101428386d998653544 (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:
x2go/utils.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/x2go/utils.py b/x2go/utils.py
index 46d96b2..a9b173c 100644
--- a/x2go/utils.py
+++ b/x2go/utils.py
@@ -405,14 +405,18 @@ def local_color_depth():
"""
if _X2GOCLIENT_OS != 'Windows':
- p = subprocess.Popen(['xwininfo', '-root',], stdout=subprocess.PIPE, )
try:
+ p = subprocess.Popen(['xwininfo', '-root',], stdout=subprocess.PIPE, )
_depth_line = [ _info.strip() for _info in p.stdout.read().split('\n') if 'Depth:' in _info ][0]
_depth = _depth_line.split(' ')[1]
return int(_depth)
except IndexError:
# a sensible default value
return 24
+ except OSError:
+ # for building your package...
+ return 24
+
else:
return win32api.GetSystemMetrics(2)
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