x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

pyhoca-cli.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via c65c7036220dabd02c9ec92c9a847ee0d07103ad (commit) via 7b7cf8c6ff244869cc07e171c53db9d43a6df57e (commit) via a2f536ffd45a97671999a223f2b4aabe6eafd10a (commit) from 406d0b9b7f4708f96d94bd6e98c382397dd94874 (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 ----------------------------------------------------------------- commit c65c7036220dabd02c9ec92c9a847ee0d07103ad Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:45:13 2012 +0200 release 0.2.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 +++++++ pyhoca/cli/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27a3d84..f32e782 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +pyhoca-cli (0.2.0.3-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.3): + - Fix license header of setup.py file. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:41:40 +0200 + pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 408a2a5..fc81d64 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.0.2" +__VERSION__ = "0.2.0.3" from frontend import * diff --git a/setup.py b/setup.py index b3f0120..72c33c3 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via 517e348dd855e47197a9c896300b608b2636b779 (commit) from 25c6b915e42d3f6d00a889fba5bb803f8d34576a (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 ----------------------------------------------------------------- commit 517e348dd855e47197a9c896300b608b2636b779 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:44:38 2012 +0200 release 0.2.0.3 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f899d9c..e5fd990 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.2.0.3-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.3): - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py and nsis_template.py. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 24 Jul 2012 02:38:29 +0200 pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.2.0.3
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, build-main has been updated via 25c6b915e42d3f6d00a889fba5bb803f8d34576a (commit) via 90e379f58839e4b757f73af72fb263b08bc0138a (commit) from 701b63f78215a2c6a75cbe2e1c10a9a220a23a01 (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 ++++++++ nsis_template.py | 17 +++++++++++++++++ pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/messages.py | 2 +- setup.py | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a03674..f899d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.2.0.3): + - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py + and nsis_template.py. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 + pyhoca-gui (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/nsis_template.py b/nsis_template.py index 3c6ce10..f3de719 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -1,6 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + NSIS_SCRIPT_TEMPLATE = """ ;{program_name}.nsi ; diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 411c05d..ef6fd76 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.2.0.2' +__VERSION__ = '0.2.0.3' from frontend import * diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 95a0a43..ffb9577 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Contributors to the code of this programme: # Dick Kniep <dick.kniep(a)lindix.nl> diff --git a/setup.py b/setup.py index 8aeceee..abb5df2 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # import the PyHoca-GUI import sys hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.2-2-g7b7cf8c
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, master has been updated via 7b7cf8c6ff244869cc07e171c53db9d43a6df57e (commit) from a2f536ffd45a97671999a223f2b4aabe6eafd10a (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 ----------------------------------------------------------------- commit 7b7cf8c6ff244869cc07e171c53db9d43a6df57e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:41:34 2012 +0200 Fix license header of setup.py file. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 29ffe29..0e92b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-cli (0.2.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.3): + - Fix license header of setup.py file. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 22:23:19 +0200 diff --git a/setup.py b/setup.py index b3f0120..72c33c3 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.2-2-g25c6b91
by git-admin＠x2go.org 24 Jul '12

24 Jul '12

The branch, master has been updated via 25c6b915e42d3f6d00a889fba5bb803f8d34576a (commit) from 90e379f58839e4b757f73af72fb263b08bc0138a (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 ----------------------------------------------------------------- commit 25c6b915e42d3f6d00a889fba5bb803f8d34576a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 24 02:38:26 2012 +0200 Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py and nsis_template.py. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 +++- nsis_template.py | 17 +++++++++++++++++ pyhoca/wxgui/messages.py | 2 +- setup.py | 4 ++-- 4 files changed, 23 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 15917bd..f899d9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ pyhoca-gui (0.2.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.2.0.3): + - Fix faulty copyright headers in setup.py, pyhoca/wxgui/messages.py + and nsis_template.py. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Thu, 12 Jul 2012 21:48:46 +0200 diff --git a/nsis_template.py b/nsis_template.py index 3c6ce10..f3de719 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -1,6 +1,23 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + NSIS_SCRIPT_TEMPLATE = """ ;{program_name}.nsi ; diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index 95a0a43..ffb9577 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # Contributors to the code of this programme: # Dick Kniep <dick.kniep(a)lindix.nl> diff --git a/setup.py b/setup.py index 8aeceee..abb5df2 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ # # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # PyHoca is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program; if not, write to the # Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # import the PyHoca-GUI import sys hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.2-1-ga2f536f
by git-admin＠x2go.org 23 Jul '12

23 Jul '12

The branch, master has been updated via a2f536ffd45a97671999a223f2b4aabe6eafd10a (commit) from 406d0b9b7f4708f96d94bd6e98c382397dd94874 (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 ----------------------------------------------------------------- commit a2f536ffd45a97671999a223f2b4aabe6eafd10a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 23 22:23:47 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ pyhoca/cli/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 27a3d84..29ffe29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-cli (0.2.0.3-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 22:23:19 +0200 + pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.2): diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 408a2a5..fc81d64 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.0.2" +__VERSION__ = "0.2.0.3" from frontend import * hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-cli.git - build-main (branch) updated: 0.2.0.2
by git-admin＠x2go.org 23 Jul '12

23 Jul '12

The branch, build-main has been updated via 406d0b9b7f4708f96d94bd6e98c382397dd94874 (commit) via 391558b4a7469a8daf4bfbda3c064aea5b7e5ccb (commit) via 14c601faad831198ca89c882071f7443d9a33017 (commit) from 1ff2562caacb61beab3fc47575b1a24b22f6283f (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 ++++++++ pyhoca/cli/__init__.py | 2 +- pyhoca/cli/frontend.py | 6 ++++-- 3 files changed, 13 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1b4eb47..27a3d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low + + * New upstream version (0.2.0.2): + - Do not fail if HOME dir is read-only, needed for building with + sbuild. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 21:42:33 +0200 + pyhoca-cli (0.2.0.1-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.1): diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 9f7fef9..408a2a5 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -25,6 +25,6 @@ For further information on X2Go, please visit the X2Go wiki: http://wiki.x2go.org """ -__VERSION__ = "0.2.0.1" +__VERSION__ = "0.2.0.2" from frontend import * diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index b957fae..7636399 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -44,11 +44,13 @@ from x2go.utils import touch_file as _touch_file # define and create known_hosts file (if not there) ssh_known_hosts_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'known_hosts') if not os.path.isfile(ssh_known_hosts_filename): - _touch_file(ssh_known_hosts_filename) + try: _touch_file(ssh_known_hosts_filename) + except OSError: pass # define and create ssh_config file (if not there) ssh_config_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'config') if not os.path.isfile(ssh_config_filename): - _touch_file(ssh_config_filename) + try: _touch_file(ssh_config_filename) + except OSError: pass # sometimes we have to fail... hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

pyhoca-cli.git - master (branch) updated: 0.2.0.1-3-g406d0b9
by git-admin＠x2go.org 23 Jul '12

23 Jul '12

The branch, master has been updated via 406d0b9b7f4708f96d94bd6e98c382397dd94874 (commit) via 391558b4a7469a8daf4bfbda3c064aea5b7e5ccb (commit) from 14c601faad831198ca89c882071f7443d9a33017 (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 ----------------------------------------------------------------- commit 406d0b9b7f4708f96d94bd6e98c382397dd94874 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 23 21:42:44 2012 +0200 release 0.2.0.2 commit 391558b4a7469a8daf4bfbda3c064aea5b7e5ccb Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 23 21:42:30 2012 +0200 Do not fail if HOME dir is read-only, needed for building with sbuild. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 8 +++++--- pyhoca/cli/frontend.py | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4468c85..27a3d84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -pyhoca-cli (0.2.0.2-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.2.0.2-0~x2go1) unstable; urgency=low - * Continue development... + * New upstream version (0.2.0.2): + - Do not fail if HOME dir is read-only, needed for building with + sbuild. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 11 Jun 2012 07:48:22 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 21:42:33 +0200 pyhoca-cli (0.2.0.1-0~x2go1) unstable; urgency=low diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index b957fae..7636399 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -44,11 +44,13 @@ from x2go.utils import touch_file as _touch_file # define and create known_hosts file (if not there) ssh_known_hosts_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'known_hosts') if not os.path.isfile(ssh_known_hosts_filename): - _touch_file(ssh_known_hosts_filename) + try: _touch_file(ssh_known_hosts_filename) + except OSError: pass # define and create ssh_config file (if not there) ssh_config_filename = os.path.join(x2go.LOCAL_HOME, x2go.X2GO_SSH_ROOTDIR, 'config') if not os.path.isfile(ssh_config_filename): - _touch_file(ssh_config_filename) + try: _touch_file(ssh_config_filename) + except OSError: pass # sometimes we have to fail... hooks/post-receive -- pyhoca-cli.git (Python X2Go Client (command line client)) 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 "pyhoca-cli.git" (Python X2Go Client (command line client)).

1 0

python-x2go.git - master (branch) updated: 0.2.0.8-1-g288950f
by git-admin＠x2go.org 23 Jul '12

23 Jul '12

The branch, master has been updated via 288950f6d62d9b56d0af5637d532836acba82740 (commit) from e5ddf494c09ea78a4dbfaf83007406089e1a781c (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 ----------------------------------------------------------------- commit 288950f6d62d9b56d0af5637d532836acba82740 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 23 21:20:56 2012 +0200 Continue development... ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8c34fd5..33e441e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.2.0.9-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 21:20:28 +0200 + python-x2go (0.2.0.8-0~x2go2) unstable; urgency=low * New upstream version (0.2.0.8): diff --git a/x2go/__init__.py b/x2go/__init__.py index 31712d8..11643bf 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.8' +__VERSION__ = '0.2.0.9' from gevent import monkey monkey.patch_all() 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).

1 0

python-x2go.git - build-main (branch) updated: 0.2.0.8
by git-admin＠x2go.org 23 Jul '12

23 Jul '12

The branch, build-main has been updated via e5ddf494c09ea78a4dbfaf83007406089e1a781c (commit) via b097b889a85392c44d78c8e47624c369db8c1ca4 (commit) via 3b530bffe8d2908683ffb785989f6b1c420d0587 (commit) from 1b376af2f94fca115ef3f8239394416940731620 (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 ++++++++ x2go/__init__.py | 2 +- x2go/backends/control/_stdout.py | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9a6a1d2..8c34fd5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +python-x2go (0.2.0.8-0~x2go2) unstable; urgency=low + + * New upstream version (0.2.0.8): + - Catch IOError exceptions during SFTP client operations. + - Proper use of except statement for multiple exception catching. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 23 Jul 2012 21:16:28 +0200 + python-x2go (0.2.0.7-0~x2go1) unstable; urgency=low * New upstream version (0.2.0.7): diff --git a/x2go/__init__.py b/x2go/__init__.py index 9b73a72..31712d8 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.7' +__VERSION__ = '0.2.0.8' from gevent import monkey monkey.patch_all() diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 6dff16a..d0441ac 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -274,7 +274,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport) try: self.sftp_client.put(os.path.normpath(local_path), remote_path) - except x2go_exceptions.SSHException, socket.error: + except (x2go_exceptions.SSHException, socket.error, IOError): # react to connection dropped error for SSH connections self.session_died = True self._transport_lock.release() @@ -306,7 +306,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.logger('sFTP-write: writing content: %s' % content, loglevel=log.loglevel_DEBUG_SFTPXFER) remote_fileobj.write(content) remote_fileobj.close() - except x2go_exceptions.SSHException, socket.error: + except (x2go_exceptions.SSHException, socket.error, IOError): self.session_died = True self._transport_lock.release() self.logger('sFTP-write: opening remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) @@ -333,7 +333,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.sftp_client = paramiko.SFTPClient.from_transport(ssh_transport) try: self.sftp_client.remove(remote_path) - except x2go_exceptions.SSHException, socket.error: + except (x2go_exceptions.SSHException, socket.error, IOError): self.session_died = True self._transport_lock.release() self.logger('sFTP-write: removing remote file %s on host %s failed' % (remote_path, self.remote_peername()), loglevel=log.loglevel_WARN) 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).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits