x2go-commits March 2014

x2go-commits@lists.x2go.org

2 participants
134 discussions

[python-x2go] branch master updated (66cecf3 -> ce97f34)
by git-admin＠x2go.org 20 Mar '14

20 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 66cecf3 Speed-optimize session profile ID <-> name mapping. new 3259daf another one: optimize session profile option retrieval new ce97f34 Handle injection of PKey (Paramiko SSH key) objects for authentication from the broker session profiles backend. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2go/backends/profiles/base.py | 20 ++++++++++++++++++ x2go/backends/profiles/file.py | 4 ++-- x2go/backends/profiles/httpbroker.py | 13 ++++++++++++ x2go/client.py | 8 ++++++++ x2go/registry.py | 7 ++++++- x2go/session.py | 2 +- x2go/utils.py | 37 ++++++++++++++++++++++++++++++++++ 8 files changed, 89 insertions(+), 4 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git

1 2

[x2gobroker] branch master updated (5a0bf3f -> 371b199)
by git-admin＠x2go.org 20 Mar '14

20 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 5a0bf3f mention a pubkey from broker client in the log file new cdc2493 Fix https brokerage in x2gobroker-daemon-debug. new 29a4fe9 typo fix new 0e51533 fix calling logger_broker new 371b199 make sure, that the authentication_pubkey reply gets included in the JSON output The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + sbin/x2gobroker-daemon-debug | 4 +--- sbin/x2gobroker-testagent | 2 +- x2gobroker/brokers/base_broker.py | 2 +- x2gobroker/web/json.py | 3 +++ 5 files changed, 7 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

1 4

[python-x2go] branch master updated (80e2752 -> 66cecf3)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from 80e2752 fix for last commit adds 66cecf3 Speed-optimize session profile ID <-> name mapping. No new revisions were added by this update. Summary of changes: debian/changelog | 1 + x2go/backends/profiles/base.py | 45 +++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 19 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git

1 0

[python-x2go] 01/01: Speed-optimize session profile ID <-> name mapping.
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag CVix/1.99.3 in repository python-x2go. commit 66cecf3095c26e005ad6b0608b1c1ff280b1a4d0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Mar 19 15:26:37 2014 +0100 Speed-optimize session profile ID <-> name mapping. --- debian/changelog | 1 + x2go/backends/profiles/base.py | 45 +++++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4052101..d2bb58a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - Provide session profile backend for a http broker. - Make session profile backends more unicode robust. - X2GoSessionProfile.get_server_hostname must return unicode objects. + - Speed-optimize session profile ID <-> name mapping. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/backends/profiles/base.py b/x2go/backends/profiles/base.py index 002124d..3aff841 100644 --- a/x2go/backends/profiles/base.py +++ b/x2go/backends/profiles/base.py @@ -60,8 +60,8 @@ class X2GoSessionProfiles(): """ self.defaultValues = {} self._profile_metatypes = {} - self._cached_profile_ids = [] - self._cached_profile_names = [] + self._cached_profile_ids = {} + self.__useexports = {} self._profiles_need_profile_id_renewal = [] self.write_user_config = False @@ -257,12 +257,11 @@ class X2GoSessionProfiles(): self._delete_profile(profile_id) - try: self._cached_profile_ids.remove(profile_id) + try: del self._cached_profile_ids[profile_id] except ValueError: pass self.add_profile(profile_id=None, force_add=True, **_config) self._profiles_need_profile_id_renewal = [] - self._cached_profile_ids = [] - self._cached_profile_names = [] + self._cached_profile_ids = {} return self._write() @@ -307,7 +306,11 @@ class X2GoSessionProfiles(): """ _profile_id = profile_id or self.check_profile_id_or_name(profile_id_or_name) _profile_config = {} - for option in self._get_profile_options(_profile_id): + if parameter is None: + parameters = self._get_profile_options(_profile_id) + else: + parameters = [parameter] + for option in parameters: value = self._get_profile_parameter(_profile_id, option, key_type=self.get_profile_option_type(option)) if option == 'export': @@ -362,6 +365,11 @@ class X2GoSessionProfiles(): except X2GoProfileException: return False + def _update_profile_ids_cache(self): + for p in self._get_profile_ids(): + if p not in self._non_profile_sections: + self._cached_profile_ids[p] = self.to_profile_name(p) + @property def profile_ids(self): """\ @@ -369,8 +377,8 @@ class X2GoSessionProfiles(): """ if not self._cached_profile_ids: - self._cached_profile_ids = [ s for s in self._get_profile_ids() if s not in self._non_profile_sections ] - return self._cached_profile_ids + self._update_profile_ids_cache() + return self._cached_profile_ids.keys() def _get_profile_ids(self): """\ @@ -402,9 +410,9 @@ class X2GoSessionProfiles(): Render a list of all profile names found in the session profiles configuration. """ - if not self._cached_profile_names: - self._cached_profile_names = [ self.to_profile_name(p) for p in self.profile_ids ] - return self._cached_profile_names + if not self._cached_profile_ids: + self._update_profile_ids_cache() + return self._cached_profile_ids.values() def has_profile_name(self, profile_name): """\ @@ -430,7 +438,7 @@ class X2GoSessionProfiles(): @rtype: C{str} """ - _profile_ids = [ p for p in self.profile_ids if self.to_profile_name(p) == profile_name ] + _profile_ids = [ p for p in self.profile_ids if self._cached_profile_ids[p] == profile_name ] if len(_profile_ids) == 1: return unicode(_profile_ids[0]) elif len(_profile_ids) == 0: @@ -449,10 +457,10 @@ class X2GoSessionProfiles(): @rtype: C{str} """ - _profile_config = self.get_profile_config(profile_id=profile_id) - if _profile_config.has_key('name'): - return unicode(_profile_config['name']) - else: + try: + _profile_name = self.get_profile_config(profile_id=profile_id, parameter='name') + return unicode(_profile_name) + except: return u'' def add_profile(self, profile_id=None, force_add=False, **kwargs): @@ -485,7 +493,6 @@ class X2GoSessionProfiles(): self.update_value(None, key, value, profile_id=profile_id) self._cached_profile_ids = [] - self._cached_profile_names = [] return unicode(profile_id) @@ -553,8 +560,8 @@ class X2GoSessionProfiles(): value = _strvalue if option == 'host': - _config = self.get_profile_config(profile_id=profile_id) - if _config.has_key('host') and _config['host'] != value: + _host = self.get_profile_config(profile_id=profile_id, parameter='host') + if _host != value: self._profiles_need_profile_id_renewal.append(profile_id) if type(value) is types.TupleType: value = list(value) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git

1 0

[pyhoca-gui] 01/01: CVix: release 1.99.3
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag CVix/1.99.3 in repository pyhoca-gui. commit 5ed0ecb04ebb9f57733092201ae9b76c42a2ec7b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Mar 20 00:40:31 2014 +0100 CVix: release 1.99.3 --- CVix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CVix.py b/CVix.py index abcc9f9..282f08e 100755 --- a/CVix.py +++ b/CVix.py @@ -37,7 +37,7 @@ import x2go import CVix_session_profile_template __AUTHOR__ = "Mike Gabriel, Dick Kniep" -__VERSION__ = "1.99.3" +__VERSION__ = "1.99.3-stable" # change this to .CVix??? -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

1 0

[pyhoca-gui] branch cvix/2.x created (now e79cdb0)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch cvix/2.x in repository pyhoca-gui. at e79cdb0 CVix: typo fix in CVix.py This branch includes the following new commits: new c44a152 CVix: import CVix specific code new 262f158 CVix: rearrange CVix files in source tree new 20b99ca Rename icon files to match default application name (PyHoca-GUI). new 327633a rename images, re-add python-x2go about image new 671e991 adapt application name in image/icon paths new 073d260 CVix: start rewrite of CVix-relevant code new 6c36a86 CVix: customize default cmdline parameters for CVix new 752afca CVix: rewrite CVix_setup.py new 84a5bb5 CVix: install customer and key file into INSTDIR new 8b98324 CVix: fix usage of datafilelist from the setup module new 404dc79 CVix: fix faulty variable name new dc2bb69 CVix: use setup.data_files in setup call new 26a7e9a CVix: use setup.executables in setup call new 1c761df CVix: there can only be one setup object, import our setup as pyhoca_setup new 286fb72 CVix: fix indentation in CVix_setup.py new 369d691 Revert "CVix: fix indentation in CVix_setup.py" new da47f0c CVix: monkey-patch SCRIPT_NAME from setup.py new 4aff437 CVix: only call setup() function on direct calls new f04b5a3 CVix: fix for commit 4aff437 new 4105d83 CVix: remove faulty string placeholder from CVix_nsis_template.py new e64c079 CVix: fix variable reference in CVix NSIS template file new 3ec6bc6 CVix: do more monkey-patching in CVix_setup.py new 4e86034 CVix: detect CVix version correctly. Reduce version slightly below 2.0 new 2ba7cb1 CVix: fix __VERSION__ setup new 9013045 CVix: syntax fix new 0345c68 CVix: merge in nsis_template options that make sense for CVix, esp. multi-user support new 93c0854 CVix: call setup_consolelog() as early as possible new 1cc877c CVix NSIS script: empty installation destination before installing new files into $INSTDIR. new cc44674 CVix: use setup_mswinlog function to start logging into a file if build is frozen new 7cb83bb CVix: properly install customer related (external) files (customer hostname and key) new fd817ce CVix: add about logo and splash image new 3ca1818 Fix referencing backends X2GoServerSessionInfo and X2GoServerSessionList. new 95b91b7 CVix: drop obsolete file new 361a3e8 CVix: add missing icon files new af64dc1 Explicitly add pyhoca.mswin to setup.py if building on MS Windows. new fe00def CVix: look into setup.py for what packages to install new be94466 Provide mswin_logging as separate module in pyhoca.wxgui namespace, undo earlier namespace split-off. new 65c73b6 CVix: only import PyHocaGUI_Launcher in CVix.py new 552efb1 Revert "CVix: look into setup.py for what packages to install" new 20bb1d0 Don't include the py.exe shell in frozen builds. new 775d2fb CVix: import mswin_logging from correct namespace new 69d0b3e CVix: disable non-Dutch languages new bc99346 Provide script for cleaning up before running bbfreeze. new 35f4ba7 make bbfreeze_cleanup.sh executable new b158d17 CVix: more Dutch-only adaptation in NSIS template new b557526 CVix: do remember exports and user names new 347d07a CVix: disable splash by default new fc11f1c CVix: release 1.99.2 new a78e19f Make the hover text of the tray icon brandable (drop hard-coded PyHoca-GUI application name). new 90c832e CVix: start on the inclusion of gsprint.exe in the installer new e374100 CVix: typo fix new 39d66f1 CVix: NSIS tweaking new 19432fe CVix: more NSIS tweaking new f292200 CVix: use already available code for gsprint support new d650ca3 CVix: fix packaging of gsprint related files new 39c8bbe CVix: fix wrong folder name new 5a97614 CVix: fix wrong folder name (2) new cf7e8dd CVix: still debugging gsview/gscript installation new 8a6e92d CVix: make sure gsview subfolders get packaged new d3f98a3 CVix: attempt silent installation of gsview new 1738298 CVix: add extra SetOutPath new 3545939 CVix: debugging ExecWait statement new 7c5f7a1 CVix: do correct quoting in NSIS script new 00861e6 CVix: explicitly set OUTPATH for gsprint related stuff new 1e73330 CVix: ExecWait uses OUTPATH as base path new 0d0b224 CVix: make sure SetOutPath gets called at the beginning of each section new 2de78bc NSIS script: make sure SetOutPath gets called at the beginning of every section. new dce16c2 Show printing preferences when tray icon is in restricted mode. new 5a73d7a CVix: tweak Python X2Go's default printing setup, open dialog box by default new fe212dc CVix: increment CVix version new e79cdb0 CVix: typo fix in CVix.py The 71 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

1 71

[x2gobroker] branch master updated (b264b5e -> 5a0bf3f)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from b264b5e If we received an SSH public key from a broker client, mark it as ACCEPTED after we deployed it, so that the client knows that it can its corresponding private key. new 5a0bf3f mention a pubkey from broker client in the log file The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2gobroker/brokers/base_broker.py | 1 + 1 file changed, 1 insertion(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

1 1

[x2gobroker] branch master updated (3b588e9 -> b264b5e)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from 3b588e9 debian/changelog: wrap too-long-line new b264b5e If we received an SSH public key from a broker client, mark it as ACCEPTED after we deployed it, so that the client knows that it can its corresponding private key. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2gobroker/brokers/base_broker.py | 3 +++ 2 files changed, 6 insertions(+) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git

1 1

[pyhoca-gui] branch master updated (aa3e4e9 -> 7f005e5)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from aa3e4e9 Provide cmdline option --broker-cacertfile. Enable https:// connections with SSL certificates that have been self-signed against a non-public root-CA certificate file. new 7f005e5 fix for last commit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: pyhoca/wxgui/frontend.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

1 1

[pyhoca-gui] branch master updated (efa31ac -> aa3e4e9)
by git-admin＠x2go.org 19 Mar '14

19 Mar '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from efa31ac update i18n files new 2cf0128 Optimize menu rendering. Reduce accessing session profile data as best as is possible. new 995a9fa brokerlogon: fix notification icons new aa3e4e9 Provide cmdline option --broker-cacertfile. Enable https:// connections with SSL certificates that have been self-signed against a non-public root-CA certificate file. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ man/man1/pyhoca-gui.1 | 4 ++++ pyhoca/wxgui/brokerlogon.py | 4 ++-- pyhoca/wxgui/defaults.py | 1 + pyhoca/wxgui/frontend.py | 4 ++++ pyhoca/wxgui/launcher.py | 1 + pyhoca/wxgui/menus_taskbar.py | 37 +++++++++++++++++++------------------ 7 files changed, 36 insertions(+), 20 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git

1 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits March 2014