x2go-commits

x2go-commits@lists.x2go.org

1 participants
37903 discussions

python-x2go.git - master (branch) updated: 0.1.1.2-5-gd5f871b
by git-admin＠x2go.org 06 Jul '11

06 Jul '11

The branch, master has been updated via d5f871ba0fa17cd63dc3bca118844ec74f3ebb03 (commit) via c84844dfe09359d4f113a533f89362581a0eb947 (commit) via 481acc6867d37250684a1530c24b32fa3dbd49ae (commit) from 6192724a528b0d585823170f54c2eced49098169 (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 d5f871ba0fa17cd63dc3bca118844ec74f3ebb03 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 6 17:21:00 2011 +0200 Stabilize desktop sharing if the remote session is not available. commit c84844dfe09359d4f113a533f89362581a0eb947 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 6 17:20:09 2011 +0200 Do not allow any interruption during X2go cleanup calls. commit 481acc6867d37250684a1530c24b32fa3dbd49ae Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 6 17:18:27 2011 +0200 Fix AttributeError if no graphical proxy instance has been declared yet. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++ x2go/backends/terminal/_stdout.py | 3 +- x2go/cleanup.py | 68 ++++++++++++++++++++---------------- x2go/client.py | 12 +++++-- x2go/session.py | 16 +++++++- 5 files changed, 66 insertions(+), 36 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ce5e92e..9ca8382 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,9 @@ python-x2go (0.1.1.3-0~x2go1) UNRELEASED; urgency=low - README/TODO update. - Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when trying to find a desktop for sharing. + - Fix AttributeError if no graphical proxy instance has been declared yet. + - Do not allow any interruption during X2go cleanup calls. + - Stabilize desktop sharing if the remote session is not available. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:53:48 +0200 diff --git a/x2go/backends/terminal/_stdout.py b/x2go/backends/terminal/_stdout.py index 4c439fd..24fc74e 100644 --- a/x2go/backends/terminal/_stdout.py +++ b/x2go/backends/terminal/_stdout.py @@ -962,5 +962,6 @@ class X2goTerminalSessionSTDOUT(object): STILL UNDOCUMENTED """ - self.proxy.__del__() + if self.proxy is not None: + self.proxy.__del__() diff --git a/x2go/cleanup.py b/x2go/cleanup.py index 8b72614..ab28fe6 100644 --- a/x2go/cleanup.py +++ b/x2go/cleanup.py @@ -62,39 +62,47 @@ def x2go_cleanup(e=None, threads=None): @type threads: C{list} """ - if threads is None: - threads = threading.enumerate() - else: - threads = threads - - # stop X2go reverse forwarding tunnels - for t in threads: - if type(t) == rforward.X2goRevFwTunnel: - t.stop_thread() - del t - - # stop X2go paramiko transports used by X2goTerminalSession objects - for t in threads: - if type(t) == paramiko.Transport: - if hasattr(t, '_x2go_session_marker'): - t.stop_thread() - del t + try: + if threads is None: + threads = threading.enumerate() + else: + threads = threads - # on Windows: stop the XServer that we evoked - if _X2GOCLIENT_OS == 'Windows': + # stop X2go reverse forwarding tunnels for t in threads: - if type(t) == xserver.X2goXServer: + if type(t) == rforward.X2goRevFwTunnel: t.stop_thread() - gevent.sleep(1) del t - # on Windows: stop the PulseAudio daemon that we evoked - if _X2GOCLIENT_OS == 'Windows': + # stop X2go paramiko transports used by X2goTerminalSession objects for t in threads: - if type(t) == pulseaudio.X2goPulseAudio: - t.stop_thread() - gevent.sleep(1) - del t - - if e is not None: - raise e + if type(t) == paramiko.Transport: + if hasattr(t, '_x2go_session_marker'): + t.stop_thread() + del t + + # on Windows: stop the XServer that we evoked + if _X2GOCLIENT_OS == 'Windows': + for t in threads: + if type(t) == xserver.X2goXServer: + t.stop_thread() + gevent.sleep(1) + del t + + # on Windows: stop the PulseAudio daemon that we evoked + if _X2GOCLIENT_OS == 'Windows': + for t in threads: + if type(t) == pulseaudio.X2goPulseAudio: + t.stop_thread() + gevent.sleep(1) + del t + + if e is not None: + raise e + + except KeyboardInterrupt: + # do not allow keyboard interrupts during Python X2go cleanup + pass + except SystemExit: + # neither do we allow SIGTERM signals during cleanup... + pass diff --git a/x2go/client.py b/x2go/client.py index eba5515..d7e6fb1 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1200,14 +1200,20 @@ class X2goClient(object): """ # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here... - _desktop = desktop or "%s@%s" % (user, display) + if desktop: + _desktop = desktop + user = None + display = None + else: + _desktop = '%s@%s' % (user, display) + if not _desktop in self._X2goClient__list_desktops(session_uuid): _orig_desktop = _desktop - _desktop = desktop or '%s.0' % _desktop + _desktop = '%s.0' % _desktop if not _desktop in self._X2goClient__list_desktops(session_uuid): raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) - return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False) + return self.session_registry(session_uuid).share_desktop(desktop=_desktop, share_mode=share_mode, check_desktop_list=False) __share_desktop_session = share_desktop_session def resume_session(self, session_uuid=None, session_name=None): diff --git a/x2go/session.py b/x2go/session.py index 9b9704e..d4500d1 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1099,10 +1099,22 @@ class X2goSession(object): if not _desktop in self._X2GoSession__list_desktops(): raise X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) + _session_owner = _desktop.split('@')[0] + _display = _desktop.split('@')[1] + if self.is_alive(): + if self.get_username() != _session_owner: + self.logger('waiting for user ,,%s\'\' to interactively grant you access to his/her desktop session...' % _session_owner, loglevel=log.loglevel_NOTICE) + self.logger('THIS MAY TAKE A WHILE!', loglevel=log.loglevel_NOTICE) + _control = self.control_session - self.terminal_session = _control.share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, - logger=self.logger, **self.terminal_params) + try: + self.terminal_session = _control.share_desktop(desktop=_desktop, share_mode=share_mode, + logger=self.logger, **self.terminal_params) + except ValueError: + # x2gostartagent output parsing will result in a ValueError. This one we will catch + # here and change it into an X2goSessionException + raise X2goSessionException('the session on desktop %s is seemingly dead' % _desktop) if self.has_terminal_session(): self.session_name = self.terminal_session.session_info.name 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 - master (branch) updated: 0.1.1.2-2-g6192724
by git-admin＠x2go.org 06 Jul '11

06 Jul '11

The branch, master has been updated via 6192724a528b0d585823170f54c2eced49098169 (commit) from 07f7380d8c343c7f583aa1faf45ad42d056c19c5 (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 6192724a528b0d585823170f54c2eced49098169 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jul 6 14:26:02 2011 +0200 Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when trying to find a desktop for sharing. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/client.py | 7 +++++-- x2go/session.py | 8 ++++++-- 3 files changed, 13 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bafb5d1..ce5e92e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ python-x2go (0.1.1.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.1.1.3): - README/TODO update. + - Desktop sharing: try ''<user>@<display>.0'' additionally to ''<user>@<display>'' when + trying to find a desktop for sharing. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:53:48 +0200 diff --git a/x2go/client.py b/x2go/client.py index 1327d33..eba5515 100644 --- a/x2go/client.py +++ b/x2go/client.py @@ -1198,11 +1198,14 @@ class X2goClient(object): @rtype: C{bool} """ - _desktop = desktop or "%s@%s" % (user, display) # X2goClient.list_desktops() uses caching (if enabled, so we prefer lookups here... + _desktop = desktop or "%s@%s" % (user, display) if not _desktop in self._X2goClient__list_desktops(session_uuid): - raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _desktop) + _orig_desktop = _desktop + _desktop = desktop or '%s.0' % _desktop + if not _desktop in self._X2goClient__list_desktops(session_uuid): + raise x2go_exceptions.X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) return self.session_registry(session_uuid).share_desktop(desktop=desktop, user=user, display=display, share_mode=share_mode, check_desktop_list=False) __share_desktop_session = share_desktop_session diff --git a/x2go/session.py b/x2go/session.py index e69f960..9b9704e 100644 --- a/x2go/session.py +++ b/x2go/session.py @@ -1092,8 +1092,12 @@ class X2goSession(object): self.terminal_session = 'PENDING' _desktop = desktop or '%s@%s' % (user, display) - if check_desktop_list and _desktop in self.list_desktops(): - raise X2goDesktopSharingException('No such desktop ID: %s' % _desktop) + if check_desktop_list: + if not _desktop in self._X2goSession__list_desktops(): + _orig_desktop = _desktop + _desktop = '%s.0' % _desktop + if not _desktop in self._X2GoSession__list_desktops(): + raise X2goDesktopSharingException('No such desktop ID: %s' % _orig_desktop) if self.is_alive(): _control = self.control_session 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

pyhoca-cli.git - master (branch) updated: 0.1.4.0-4-g0ec13f5
by git-admin＠x2go.org 05 Jul '11

05 Jul '11

The branch, master has been updated via 0ec13f5a3e0e46660f19cc041288e72f8e27e3e5 (commit) via 2f472c5de266e7b753ba7af4eb0af884f737c0c5 (commit) from 44707167ff93033439b8bf61b5f2e5fd5e88b042 (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 0ec13f5a3e0e46660f19cc041288e72f8e27e3e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 5 21:49:39 2011 +0200 Add --quiet option to disable any kind of log output. commit 2f472c5de266e7b753ba7af4eb0af884f737c0c5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jul 5 21:23:16 2011 +0200 Fix for Ctrl-C comment when sharing a desktop. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 12 ++++++++++-- man/man1/pyhoca-cli.1 | 3 +++ pyhoca-cli | 5 +++++ pyhoca/cli/frontend.py | 5 ++++- 4 files changed, 22 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 6e7903e..97c78d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,18 @@ -pyhoca-cli (0.1.4.0-0~x2go2) UNRELEASED; urgency=low +pyhoca-cli (0.1.4.1-0~x2go1) UNRELEASED; urgency=low + + * New upstream version (0.1.4.1): + - Fix for Ctrl-C comment when sharing a desktop. + - Add --quiet option to disable any kind of log output. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:32 +0200 + +pyhoca-cli (0.1.4.0-0~x2go2) unstable; urgency=low * Already prepare for new upstream version (0.1.4.1): - README/TODO update. * Depend on Python X2go 0.1.1.2. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 20:10:26 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 05 Jul 2011 21:22:28 +0200 pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low diff --git a/man/man1/pyhoca-cli.1 b/man/man1/pyhoca-cli.1 index ef69c0f..7fa18a0 100644 --- a/man/man1/pyhoca-cli.1 +++ b/man/man1/pyhoca-cli.1 @@ -43,6 +43,9 @@ Display a help with all available command line options and exit. \*(T<\fB\-V, \-\-version\fR\*(T> Output version information and exit. .TP +\*(T<\fB\-d, \-\-quiet\fR\*(T> +No output to stdout at all! +.TP \*(T<\fB\-d, \-\-debug\fR\*(T> Enable debugging output. .TP diff --git a/pyhoca-cli b/pyhoca-cli index 9838a98..34fb297 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -103,6 +103,7 @@ action_options = [ # debug options... debug_options = [ {'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', }, + {'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', }, {'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2go module', }, {'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', }, {'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', }, @@ -194,6 +195,10 @@ Possible values for the --pack NX option are: if a.libdebug: liblogger.set_loglevel_debug() + if a.quiet: + logger.set_loglevel_quiet() + liblogger.set_loglevel_quiet() + if a.libdebug_sftpxfer: liblogger.enable_debug_sftpxfer() diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 8b58146..8931e3d 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -377,7 +377,10 @@ class PyHocaCLI(x2go.X2goClient): session_name = self._X2goClient__get_session_name(self.x2go_session_hash) self._pyhoca_logger("X2go session is now running, the X2go client's profile name is: %s" % profile_name, loglevel=x2go.loglevel_INFO, ) self._pyhoca_logger("X2go session name is: %s" % session_name, loglevel=x2go.loglevel_INFO, ) - self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) + if self.args.share_desktop: + self._pyhoca_logger("Press CTRL+C to end desktop sharing for this session...", loglevel=x2go.loglevel_NOTICE, ) + else: + self._pyhoca_logger("Press CTRL+C to suspend the running session...", loglevel=x2go.loglevel_NOTICE, ) try: session_duration = 0 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.1.0.5-8-g5887f89
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via 5887f89da2b562aeb68b295078b2fb5d45c4db1f (commit) via 05cfc1a637fd8a5244b610207f8c8d70c443556c (commit) via 544bab8bfa04efcd1fb339f78df583ed467dd82e (commit) via 3160d3c795a6a01415611622e75c9cb34909e9a9 (commit) via b8de53ad4d828750cf6b31707be8db0fb9e9843a (commit) via 7837ad69ebcd3bc72b20f227b161538abc5d8bcd (commit) via d4b8884865dcd55fd450cd40deb8ad804e9cf17a (commit) via 718e39e05816677779b7481dcf10dfd122fdd31f (commit) from c336e8a87da20287a0631a78e37a74118dc9c06f (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: README | 2 +- TODO | 3 +-- debian/changelog | 15 +++++++++++++-- debian/control | 2 +- po/de.po | 2 +- pyhoca/wxgui/__init__.py | 2 +- pyhoca/wxgui/notify.py | 9 ++++++++- 7 files changed, 26 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/README b/README index 9573837..36b2700 100644 --- a/README +++ b/README @@ -34,7 +34,7 @@ Please refer to the TODO file that has been shipped with pyhoca-gui. Thanks in advance for your feedback and contributions, -Kiel (Germany) & LJ Almere Haven (Netherlands), 20101231 +Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701 Dick Kniep <dick.kniep(a)lindix.nl> Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/TODO b/TODO index 56ea4de..07f2148 100644 --- a/TODO +++ b/TODO @@ -8,7 +8,6 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. * profile manager (Windows registry based) * options manager -* grouping of profiles in session profile menu * shadow session support === pyhoca-gui Wishlist === @@ -18,7 +17,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. If you find any issues with this programme please let me know. -Kiel (Germany) & LJ Almere Haven (Netherlands), 20110419 +Kiel (Germany) & LJ Almere Haven (Netherlands), 20110701 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Dick Kniep <dick.kniep(a)lindix.nl> diff --git a/debian/changelog b/debian/changelog index 461ee18..3b99600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,15 @@ -pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low +pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low + + * New upstream version (0.1.0.6): + - bugfix release. + - unicode fix for Windows notifications + - i18n fixes + - README/TODO update. + * Properly depend on Python X2go package. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:04:42 +0200 + +pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low * New upstream version (0.1.0.5): - bugfix release @@ -16,7 +27,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low * React to bug #627990, prefer man2html-base over man2html. * Depend on Python X2go 0.1.1.2 - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 16:39:24 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 13:55:42 +0200 pyhoca-gui (0.1.0.4-0~x2go1) unstable; urgency=low diff --git a/debian/control b/debian/control index 23b5475..e8a5e8b 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.2-0~0), + python-x2go (>=0.1.1.2-0~), python-argparse, python-notify, python-setproctitle, diff --git a/po/de.po b/po/de.po index 5e602ff..95370ca 100644 --- a/po/de.po +++ b/po/de.po @@ -979,7 +979,7 @@ msgid "" "user. The PyHoca-GUI icon can be found in your desktops's\n" "notification area/systray." msgstr "" -"PyHoca-GUI is bereits gestartet für Benutzer/in ,,%s''!\n" +"PyHoca-GUI ist bereits gestartet für Benutzer/in ,,%s''!\n" "\n" "Nur eine Instanz von PyHoca-GUI kann pro Benutzer/in\n" "gestartet werden. Das PyHoca-GUI Icon befindet sich auf\n" diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index b8617d3..d9494a0 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.1.0.5' +__VERSION__ = '0.1.0.6' from frontend import * diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index b0a2160..af6a2d6 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -173,7 +173,14 @@ class notificationmessage_NotifierPopup(object): # wx.NotificationMessage class pass - self._pyhoca_logger('[%s] %s' % (title.encode(utils.get_encoding()), text.encode(utils.get_encoding())), loglevel=log.loglevel_NOTICE) + # on Windows some error messages are already encoded, some are not, depending from which module they come + try: _title = title.encode(utils.get_encoding()) + except: _title = title + try: _text = text.encode(utils.get_encoding()) + except: _text = text + + try: self._pyhoca_logger('['+_title+'] '+_text, loglevel=log.loglevel_NOTICE) + except UnicodeDecodeError: self._pyhoca_logger('Unicode error occurred while rendering a log message...', loglevel=log.loglevel_WARN) def Close(self): pass 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 - master (branch) updated: 0.1.0.5-8-g5887f89
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via 5887f89da2b562aeb68b295078b2fb5d45c4db1f (commit) from 05cfc1a637fd8a5244b610207f8c8d70c443556c (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 5887f89da2b562aeb68b295078b2fb5d45c4db1f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 20:15:13 2011 +0200 Properly depend on Python X2go package. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8bd829c..3b99600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,11 @@ pyhoca-gui (0.1.0.6-0~x2go3) UNRELEASED; urgency=low * New upstream version (0.1.0.6): + - bugfix release. - unicode fix for Windows notifications - i18n fixes - README/TODO update. + * Properly depend on Python X2go package. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:04:42 +0200 diff --git a/debian/control b/debian/control index 23b5475..e8a5e8b 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.2-0~0), + python-x2go (>=0.1.1.2-0~), python-argparse, python-notify, python-setproctitle, 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 - build-main (branch) updated: 0.1.4.0-2-g4470716
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, build-main has been updated via 44707167ff93033439b8bf61b5f2e5fd5e88b042 (commit) via 09acccc8c7b77679dffc45348de1f4d25dad78ad (commit) from 30b1249f0c62590bf4007b03639543156499e903 (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: README | 7 ++++--- TODO | 5 ++--- debian/changelog | 12 ++++++++++-- debian/control | 2 +- pyhoca/cli/__init__.py | 2 +- 5 files changed, 18 insertions(+), 10 deletions(-) The diff of changes is: diff --git a/README b/README index 67346f7..5c9985f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> @@ -27,6 +27,7 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. * retrieve a list of running sessions * sound support available * local folder sharing +* share an already running desktop session with yourself or another user === How to use it === @@ -41,9 +42,9 @@ Please refer to the TODO file that has been shipped with pyhoca-cli. Thanks in advance for your feedback and contributions, -Kiel (Germany), 20101013, +Kiel (Germany), 20110701, - Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> + Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> diff --git a/TODO b/TODO index fd05d7e..93bcd20 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,4 @@ -pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +pyhoca-cli - Copyright (C) 2010-2011 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> @@ -11,7 +11,6 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. === pyhoca-cli TODOs === * enable printing support -* enable shadow session support === pyhoca-cli Wishlist === @@ -21,6 +20,6 @@ See http://www.gnu.org/licenses/gpl.html for a recent copy. If you find any issues with this programme please let me know. -Kiel (Germany), 20101013, +Kiel (Germany), 20110701, Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> diff --git a/debian/changelog b/debian/changelog index 3b99e99..6e7903e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -pyhoca-cli (0.1.4.0-0~x2go4) UNRELEASED; urgency=low +pyhoca-cli (0.1.4.0-0~x2go2) UNRELEASED; urgency=low + + * Already prepare for new upstream version (0.1.4.1): + - README/TODO update. + * Depend on Python X2go 0.1.1.2. + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 20:10:26 +0200 + +pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low * New upstream version (0.1.4.0): - Add X2go desktop sharing support. @@ -6,7 +14,7 @@ pyhoca-cli (0.1.4.0-0~x2go4) UNRELEASED; urgency=low suspending them. * React to bug #627990, prefer man2html-base over man2html. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 24 Jun 2011 17:08:12 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:52:29 +0200 pyhoca-cli (0.1.3.3-0~x2go2) unstable; urgency=low diff --git a/debian/control b/debian/control index 0cc96cd..32c4033 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.0-0~0), + python-x2go (>=0.1.1.2-0~), python-argparse, python-setproctitle Description: A command line X2go client written in Python diff --git a/pyhoca/cli/__init__.py b/pyhoca/cli/__init__.py index 72337e6..9ce6174 100644 --- a/pyhoca/cli/__init__.py +++ b/pyhoca/cli/__init__.py @@ -20,6 +20,6 @@ """\ STILL UNDOCUMENTED """ -__VERSION__ = "0.1.4.0" +__VERSION__ = "0.1.4.1" 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 - master (branch) updated: 0.1.4.0-2-g4470716
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via 44707167ff93033439b8bf61b5f2e5fd5e88b042 (commit) from 09acccc8c7b77679dffc45348de1f4d25dad78ad (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 44707167ff93033439b8bf61b5f2e5fd5e88b042 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 20:11:23 2011 +0200 Depend on Python X2go 0.1.1.2. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 7 ++++--- debian/control | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index a13b128..6e7903e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -pyhoca-cli (0.1.4.1-0~x2go1) UNRELEASED; urgency=low +pyhoca-cli (0.1.4.0-0~x2go2) UNRELEASED; urgency=low - * New upstream version (0.1.4.1): + * Already prepare for new upstream version (0.1.4.1): - README/TODO update. + * Depend on Python X2go 0.1.1.2. - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 01 Jul 2011 14:52:44 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 04 Jul 2011 20:10:26 +0200 pyhoca-cli (0.1.4.0-0~x2go4) unstable; urgency=low diff --git a/debian/control b/debian/control index 0cc96cd..32c4033 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.1.1.0-0~0), + python-x2go (>=0.1.1.2-0~), python-argparse, python-setproctitle Description: A command line X2go client written in Python 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

buildscripts.git - master (branch) updated: d079d87d600c82022c2659341662a22c76095611
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via d079d87d600c82022c2659341662a22c76095611 (commit) from 0374acf263de19a8e68c7dd4c31769fabaa46159 (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 d079d87d600c82022c2659341662a22c76095611 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 18:15:55 2011 +0200 enforcing another reset --hard after pulling the refspec ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index 3492f50..88a1174 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -108,6 +108,8 @@ prepare_workspace() { cd $PROJECT_DIR && git reset --hard git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT git pull origin $CHECKOUT + # and again, get the $CHECKOUT refspec in pure state + git reset --hard else cd $(dirname $PROJECT_DIR) git clone git://code.x2go.org/$PROJECT.git hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).

1 0

buildscripts.git - master (branch) updated: 0374acf263de19a8e68c7dd4c31769fabaa46159
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via 0374acf263de19a8e68c7dd4c31769fabaa46159 (commit) from 364bbade16751d9574f0a5da4d09450f1ed39f6e (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 0374acf263de19a8e68c7dd4c31769fabaa46159 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 18:14:05 2011 +0200 wrong option order ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index fb50d5e..3492f50 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -112,7 +112,7 @@ prepare_workspace() { cd $(dirname $PROJECT_DIR) git clone git://code.x2go.org/$PROJECT.git cd $PROJECT - git checkout --force $CHECKOUT || git --force checkout -b $CHECKOUT; + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT; fi cd $PROJECT_DIR hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).

1 0

buildscripts.git - master (branch) updated: 364bbade16751d9574f0a5da4d09450f1ed39f6e
by git-admin＠x2go.org 04 Jul '11

04 Jul '11

The branch, master has been updated via 364bbade16751d9574f0a5da4d09450f1ed39f6e (commit) from 53dc690bf2d0e8abd15e34cef3c4a181778d2306 (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 364bbade16751d9574f0a5da4d09450f1ed39f6e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 4 18:11:32 2011 +0200 enforcing git-checkouts ----------------------------------------------------------------------- Summary of changes: bin/x2go-build-package | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/bin/x2go-build-package b/bin/x2go-build-package index 07090a8..fb50d5e 100755 --- a/bin/x2go-build-package +++ b/bin/x2go-build-package @@ -106,13 +106,13 @@ prepare_workspace() { if [ -d $PROJECT_DIR/.git ]; then cd $PROJECT_DIR && git reset --hard - git checkout $CHECKOUT || git checkout -b $CHECKOUT + git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT git pull origin $CHECKOUT else cd $(dirname $PROJECT_DIR) git clone git://code.x2go.org/$PROJECT.git cd $PROJECT - git checkout $CHECKOUT || git checkout -b $CHECKOUT; + git checkout --force $CHECKOUT || git --force checkout -b $CHECKOUT; fi cd $PROJECT_DIR hooks/post-receive -- buildscripts.git (buildscripts upstream project) 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 "buildscripts.git" (buildscripts upstream project).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits