x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

python-x2go.git - master (branch) updated: 0.2.0.10-71-gc008047
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via c0080475df80c728c9b5d1a44e60a2105327c73b (commit) from 5b35eeeed3c98f3d2d0972b58b7f5e905ae5872a (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 c0080475df80c728c9b5d1a44e60a2105327c73b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 21:09:51 2012 +0100 fix for last commit ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 12e6d6a..53489b3 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -1011,7 +1011,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @rtype: C{list} """ - self._already_querying_published_applications.acquire(): + self._already_querying_published_applications.acquire() if defaults.X2GOCLIENT_OS != 'Windows' and lang is None: lang = locale.getdefaultlocale()[0] @@ -1034,6 +1034,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if very_raw: self.logger('published applications query for %s finished, return very raw output' % self.profile_name, loglevel=log.loglevel_NOTICE) + self._already_querying_published_applications.release() return _raw_output ### STAGE 2: dissect the text file retrieved from server, cut into single menu elements @@ -1055,6 +1056,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): if raw: self.logger('published applications query for %s finished, returning raw output' % self.profile_name, loglevel=log.loglevel_NOTICE) + self._already_querying_published_applications.release() return _menu if len(_menu) > max_no_submenus >= 0: @@ -1182,7 +1184,6 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self._already_querying_published_applications.release() return self._published_applications_menu - def start(self, **kwargs): """\ Start a new X2Go 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

python-x2go.git - master (branch) updated: 0.2.0.10-70-g5b35eee
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 5b35eeeed3c98f3d2d0972b58b7f5e905ae5872a (commit) from b37028bb97e1c1dc628d28caa2c2318d4da409d1 (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 5b35eeeed3c98f3d2d0972b58b7f5e905ae5872a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 20:54:16 2012 +0100 Use threading.Lock to prohibit simultaneous calls of get_published_applications() of control sessions. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ x2go/backends/control/_stdout.py | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ec4d16..60103f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,8 @@ python-x2go (0.2.1.0-0~x2go1) UNRELEASED; urgency=low versions of Python Paramiko. - Allow usernames containing space characters in user names (common on MS Windows). + - Use threading.Lock to prohibit simultaneous calls of + get_published_applications() of control sessions. * /debian/rules: + Allow package build on systems with missing dh_python2. * /debian/control: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 62104fb..12e6d6a 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -219,7 +219,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): self.session_died = False self.published_applications_no_submenus = published_applications_no_submenus - self._already_querying_published_applications = False + self._already_querying_published_applications = threading.Lock() self._transport_lock = threading.Lock() @@ -1011,12 +1011,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): @rtype: C{list} """ - - if self._already_querying_published_applications: - self.logger('This control session instance is currently already querying the published applications menu tree for session profile %s. Whenever this warning pops up in your log file it means that you should fix your client implementation code. Only call this method once per session profile!!!' % self.profile_name, loglevel=log.loglevel_WARN) - return None - else: - self._already_querying_published_applications = True + self._already_querying_published_applications.acquire(): if defaults.X2GOCLIENT_OS != 'Windows' and lang is None: lang = locale.getdefaultlocale()[0] @@ -1184,7 +1179,7 @@ class X2goControlSessionSTDOUT(paramiko.SSHClient): # FIXME: ignoring the absence of the published applications feature for now, handle it appropriately later pass - self._already_querying_published_applications = False + self._already_querying_published_applications.release() return self._published_applications_menu 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-gui.git - master (branch) updated: 0.2.0.4-90-g4354726
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 4354726c3a3acf92604a55f0ea1f607881450dc5 (commit) from ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 (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 4354726c3a3acf92604a55f0ea1f607881450dc5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 21:07:48 2012 +0100 query Python X2Go for availability of SSH agent forwarding feature ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 2251c4c..1c976a2 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -32,7 +32,7 @@ import x2go.defaults as defaults from x2go import X2GOCLIENT_OS from x2go import defaults - +from x2go._paramiko import PARAMIKO_FEATURE import notify import basepath @@ -251,7 +251,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER) self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY), size=wx.Size(self._textfield_height,self._textfield_height), ) self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication")) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections")) self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy")) self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ") @@ -584,7 +584,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2)) sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL) sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7) @@ -851,7 +851,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) self.SSHAutoLogin.SetValue(self.profile_config['autologin']) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent']) self.SSHKeyFile.SetValue(self.profile_config['key']) if self.profile_config['autologin']: @@ -1041,7 +1041,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self._toggle_DefaultSoundPort() self.SSHPort.SetValue(self.profile_config['rdpport']) self.SSHAutoLogin.SetValue(False) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.SetValue(False) self.RDPOptions.SetValue(self.profile_config['directrdpsettings']) self.RDPServerLabel.Enable(True) @@ -1231,7 +1231,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFileLabel.Enable(False) self.SSHKeyFile.Enable(False) self.SSHAutoLogin.Enable(False) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.Enable(False) self.UseSSHProxy.Enable(False) self.staticbox_Proxy.Enable(False) @@ -1270,7 +1270,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['autostart'] = self.AutoStartSession.GetValue() self.profile_config['autoconnect'] = self.AutoConnectSessionProfile.GetValue() self.profile_config['autologin'] = self.SSHAutoLogin.GetValue() - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue() else: self.profile_config['forwardsshagent'] = False @@ -1505,7 +1505,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHKeyFile.Enable(False) self.SSHKeyFileBrowseButton.Enable(False) self.SSHAutoLogin.Enable(False) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.Enable(False) self.UseSSHProxy.Enable(False) self.staticbox_LinkSpeed.Enable(False) @@ -1575,11 +1575,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue()) self.SSHAutoLogin.Enable(True) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.Enable(True) - self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) - if X2GOCLIENT_OS != "Windows": self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) + self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) if not self.SSHAutoLogin.GetValue(): self.SSHKeyFileLabel.Enable(True) self.SSHKeyFile.Enable(True) @@ -1675,12 +1674,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config_bak['soundsystem'] = self._get_SoundSystem() self.profile_config_bak['usesshproxy'] = self.UseSSHProxy.GetValue() self.profile_config_bak['autologin'] = self.SSHAutoLogin.GetValue() - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue() + self.SSHForwardAuthAgent.SetValue(False) self.UseSSHProxy.SetValue(False) self.SSHAutoLogin.SetValue(False) - if X2GOCLIENT_OS != "Windows": - self.SSHForwardAuthAgent.SetValue(False) self.PulseAudio.SetValue(True) self.Arts.SetValue(False) self.Esd.SetValue(False) @@ -1706,7 +1704,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self._set_SoundSystem(self.profile_config_bak['soundsystem']) self._toggle_DefaultSoundPort() self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) self.RDPServerLabel.Enable(True) self.RDPServer.Enable(True) @@ -1725,7 +1723,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.disable_DirectRDP() self._toggle_SetKeyboard() self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin']) - if X2GOCLIENT_OS != "Windows": + if PARAMIKO_FEATURE['forward-ssh-agent'] self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent']) self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy']) self._toggle_SSHProxy() 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.2.0.4-89-gec4e5f5
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 (commit) from 113a759d6a62ce7da966cb23eba9203dfd7341a9 (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 ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 20:59:18 2012 +0100 Use threading.Lock() to prevent from simultaneous calls of the _init_pubapp_sessions() method. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/frontend.py | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 78c4adf..a17dd0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,8 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low buttons. - Disable SSH agent forwarding for Windows. Code in Python Paramiko is no executable on MS Windows, currently. + - Use threading.Lock() to prevent from simultaneous calls of the + _init_pubapp_sessions() method. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index e5b9a95..d8c1e98 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -484,6 +484,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if profile_name is None and session_uuid: profile_name = self._X2goClient__get_session_profile_name(session_uuid) + if not self._temp_launching_pubapp_profiles.has_key(profile_name): + self._temp_launching_pubapp_profiles[profile_name] = threading.Lock() + if not self._X2goClient__client_connected_sessions_of_profile_name(profile_name): return None @@ -496,10 +499,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if len(self.client_pubapp_sessions_of_profile_name(profile_name=profile_name)): return False - if profile_name not in self._temp_launching_pubapp_profiles: - self._temp_launching_pubapp_profiles.append(profile_name) - else: - return None + self._temp_launching_pubapp_profiles[profile_name].acquire() pubapp_session_started = False pubapp_session_resumed = False @@ -553,8 +553,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): ) pubapp_session_started = pubapp_session.start() - if profile_name in self._temp_launching_pubapp_profiles: - self._temp_launching_pubapp_profiles.remove(profile_name) + self._temp_launching_pubapp_profiles.release() return pubapp_session_started | pubapp_session_resumed 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.2.0.4-88-g113a759
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 113a759d6a62ce7da966cb23eba9203dfd7341a9 (commit) from f135580befdc5dd364bca91c8a64e3d29dff4c88 (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 113a759d6a62ce7da966cb23eba9203dfd7341a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 12:40:12 2012 +0100 fixing the NSIS MUI2 installer from a Windows machine ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 69 ++++++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 46 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 8aca767..e9db9eb 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -53,6 +53,12 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" !include MultiUser.nsh !include MUI2.nsh +!insertmacro MULTIUSER_PAGE_INSTALLMODE +!insertmacro MUI_PAGE_LICENSE LICENSE.txt +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_LANGUAGE "English" ;first language is the default language ;!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" @@ -111,35 +117,6 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ;!insertmacro MUI_LANGUAGE "Esperanto" ;!insertmacro MUI_LANGUAGE "Asturian" - -;-------------------------------- - -; Installer Language Configuration - -!include LogicLib.nsh - -var LC_MESSAGES - -; i18n strings -var REQUIRED -var DESKTOP_LINKS -var STARTMENU_LINKS -var WITHOUT_PULSEAUDIO -var GSPRINT - -; First is default -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\English.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Dutch.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\French.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\German.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Korean.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Russian.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Spanish.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Swedish.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\TradChinese.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\SimpChinese.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Slovak.nlf" - ; License data ; Not exactly translated, but it shows what's needed LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" @@ -169,10 +146,25 @@ LangString Name ${{LANG_SWEDISH}} "Swedish" ;LangString Name ${{LANG_SIMPCHINESE}} "Simplified Chinese" ;LangString Name ${{LANG_SLOVAK}} "Slovak" -Function .onInit +;-------------------------------- - ;Language selection dialog +; Installer Language Configuration + +;!include LogicLib.nsh + +var LC_MESSAGES + +; i18n strings +var REQUIRED +var DESKTOP_LINKS +var STARTMENU_LINKS +var WITHOUT_PULSEAUDIO +var GSPRINT +Function .onInit + +; ;Language selection dialog +; Push "" Push ${{LANG_ENGLISH}} Push English @@ -234,7 +226,6 @@ Function .onInit !insertmacro MULTIUSER_INIT - FunctionEnd Function un.onInit @@ -245,20 +236,6 @@ FunctionEnd ;-------------------------------- -; Pages -;Page license -;Page components -;Page directory -;Page instfiles - -!insertmacro MULTIUSER_PAGE_INSTALLMODE -!insertmacro MUI_PAGE_LICENSE LICENSE.txt -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -;UninstPage uninstConfirm -;UninstPage instfiles - ;-------------------------------- ; The stuff to install 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.2.0.4-87-gf135580
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via f135580befdc5dd364bca91c8a64e3d29dff4c88 (commit) from 337e86379c75a67cbd224d29ce26d50a7d702bc3 (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 f135580befdc5dd364bca91c8a64e3d29dff4c88 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 11:48:43 2012 +0100 more MUI fixes ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 2951d5f..8aca767 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -47,6 +47,12 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ; OBSOLETE WITH MUI2: Request application privileges for Windows Vista ;RequestExecutionLevel admin +!define MULTIUSER_EXECUTIONLEVEL Highest +!define MULTIUSER_MUI +!define MULTIUSER_INSTALLMODE_COMMANDLINE +!include MultiUser.nsh +!include MUI2.nsh + !insertmacro MUI_LANGUAGE "English" ;first language is the default language ;!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" @@ -105,11 +111,6 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ;!insertmacro MUI_LANGUAGE "Esperanto" ;!insertmacro MUI_LANGUAGE "Asturian" -!define MULTIUSER_EXECUTIONLEVEL Highest -!define MULTIUSER_MUI -!define MULTIUSER_INSTALLMODE_COMMANDLINE -!include MultiUser.nsh -!include MUI2.nsh ;-------------------------------- @@ -141,14 +142,14 @@ var GSPRINT ; License data ; Not exactly translated, but it shows what's needed -;;LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" -;;LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt" -;;LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt" -;;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" -;;LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" -;;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" +LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt" 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.2.0.4-86-g337e863
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via 337e86379c75a67cbd224d29ce26d50a7d702bc3 (commit) from ae0304eb4c90d488c0f72a5c47dffaabf52fb380 (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 337e86379c75a67cbd224d29ce26d50a7d702bc3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 11:45:40 2012 +0100 load language files first ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 3373703..2951d5f 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -47,12 +47,6 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ; OBSOLETE WITH MUI2: Request application privileges for Windows Vista ;RequestExecutionLevel admin -!define MULTIUSER_EXECUTIONLEVEL Highest -!define MULTIUSER_MUI -!define MULTIUSER_INSTALLMODE_COMMANDLINE -!include MultiUser.nsh -!include MUI2.nsh - !insertmacro MUI_LANGUAGE "English" ;first language is the default language ;!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" @@ -111,6 +105,12 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ;!insertmacro MUI_LANGUAGE "Esperanto" ;!insertmacro MUI_LANGUAGE "Asturian" +!define MULTIUSER_EXECUTIONLEVEL Highest +!define MULTIUSER_MUI +!define MULTIUSER_INSTALLMODE_COMMANDLINE +!include MultiUser.nsh +!include MUI2.nsh + ;-------------------------------- ; Installer Language Configuration 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.2.0.4-85-gae0304e
by git-admin＠x2go.org 16 Nov '12

16 Nov '12

The branch, master has been updated via ae0304eb4c90d488c0f72a5c47dffaabf52fb380 (commit) from 4869754ee97d279f284aeddfb5cf6092211cf7b1 (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 ae0304eb4c90d488c0f72a5c47dffaabf52fb380 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 16 11:33:52 2012 +0100 fix MUI2 installation ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 4 ---- 1 file changed, 4 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 29a2170..3373703 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -53,10 +53,6 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" !include MultiUser.nsh !include MUI2.nsh -!insertmacro MULTIUSER_PAGE_INSTALLMODE -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_LANGUAGE "English" ;first language is the default language ;!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" 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.2.0.4-84-g4869754
by git-admin＠x2go.org 15 Nov '12

15 Nov '12

The branch, master has been updated via 4869754ee97d279f284aeddfb5cf6092211cf7b1 (commit) from 6d8aba1eaba4423f8c49f5dcb9883b152ef0324c (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 4869754ee97d279f284aeddfb5cf6092211cf7b1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 15 23:10:55 2012 +0100 fix LICENSE display with MUI ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 6fbb2cb..29a2170 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -145,14 +145,14 @@ var GSPRINT ; License data ; Not exactly translated, but it shows what's needed -LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_DUTCH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_FRENCH}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_GERMAN}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_KOREAN}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" -LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_RUSSIAN}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_SPANISH}} "LICENSE.txt" +;;LicenseLangString myLicenseData ${{LANG_SWEDISH}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_TRADCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SIMPCHINESE}} "LICENSE.txt" ;LicenseLangString myLicenseData ${{LANG_SLOVAK}} "LICENSE.txt" @@ -255,7 +255,7 @@ FunctionEnd ;Page instfiles !insertmacro MULTIUSER_PAGE_INSTALLMODE -!insertmacro MUI_PAGE_LICENSE +!insertmacro MUI_PAGE_LICENSE LICENSE.txt !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES 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.2.0.4-83-g6d8aba1
by git-admin＠x2go.org 15 Nov '12

15 Nov '12

The branch, master has been updated via 6d8aba1eaba4423f8c49f5dcb9883b152ef0324c (commit) from 728f2948cfa6a1d648c10b6b962dce1901d5a01d (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 6d8aba1eaba4423f8c49f5dcb9883b152ef0324c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Nov 15 23:09:04 2012 +0100 fix for last commit ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 1 - 1 file changed, 1 deletion(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 02058b9..6fbb2cb 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -254,7 +254,6 @@ FunctionEnd ;Page directory ;Page instfiles -!insertmacro MULTIUSER_INIT !insertmacro MULTIUSER_PAGE_INSTALLMODE !insertmacro MUI_PAGE_LICENSE !insertmacro MUI_PAGE_DIRECTORY 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits