python-x2go.git - twofactorauth (branch) updated: 6a8ee1797b80178715dfb80161bad69f105968dd - x2go-commits

14 Sep 2013

The branch, twofactorauth has been updated
       via  6a8ee1797b80178715dfb80161bad69f105968dd (commit)
      from  dbea10ba20833f6be0f56bc5f40ee12754d505dc (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:
 Makefile.pre-debuild                               |    2 +-
 ...> x2go.x2go_exceptions.WindowsError-class.html} |   10 +++++-----
 x2go/backends/proxy/_nx3.py                        |    1 +
 3 files changed, 7 insertions(+), 6 deletions(-)
 copy doc/html/{x2go.x2go_exceptions.X2goUserException-class.html => x2go.x2go_exceptions.WindowsError-class.html} (92%)

The diff of changes is:

diff --git a/Makefile.pre-debuild b/Makefile.pre-debuild
index 61fd13b..12d817b 100644
--- a/Makefile.pre-debuild
+++ b/Makefile.pre-debuild
@@ -2,7 +2,7 @@
 # Makefile.pre-debuild file - for python-x2go
 # Copyright 2010 by Mike Gabriel, GPLv3 applies to this file
 
-VERSION=0.0.31
+VERSION=`head -n1 debian/changelog | sed 's,.*(\(.*\)).*,\1,'` | cut -d"-" -f1
 DOC_HOST=packages.das-netzwerkteam.de
 DOC_PATH=/srv/sites/das-netzwerkteam.de/packages/doc/python-x2go
 DOC_USER=mike
diff --git a/doc/html/x2go.x2go_exceptions.X2goUserException-class.html b/doc/html/x2go.x2go_exceptions.WindowsError-class.html
similarity index 92%
copy from doc/html/x2go.x2go_exceptions.X2goUserException-class.html
copy to doc/html/x2go.x2go_exceptions.WindowsError-class.html
index e5a5d3d..2900b55 100644
--- a/doc/html/x2go.x2go_exceptions.X2goUserException-class.html
+++ b/doc/html/x2go.x2go_exceptions.WindowsError-class.html
@@ -3,7 +3,7 @@
           "DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>x2go.x2go_exceptions.X2goUserException</title>
+  <title>x2go.x2go_exceptions.WindowsError</title>
   <link rel="stylesheet" href="epydoc.css" type="text/css" />
   <script type="text/javascript" src="epydoc.js"></script>
 </head>
@@ -44,7 +44,7 @@
       <span class="breadcrumbs">
         <a href="x2go-module.html">Package x2go</a> ::
         <a href="x2go.x2go_exceptions-module.html">Module x2go_exceptions</a> ::
-        Class X2goUserException
+        Class WindowsError
       </span>
     </td>
     <td>
@@ -52,14 +52,14 @@
         <!-- hide/show private -->
         <tr><td align="right"><span class="options"
             >[<a href="frames.html" target="_top">frames</a
-            >] | <a href="x2go.x2go_exceptions.X2goUserException-class.html"
+            >] | <a href="x2go.x2go_exceptions.WindowsError-class.html"
             target="_top">no frames</a>]</span></td></tr>
       </table>
     </td>
   </tr>
 </table>
 <!-- ==================== CLASS DESCRIPTION ==================== -->
-<h1 class="epydoc">Class X2goUserException</h1><p class="nomargin-top"><span class="codelink"><a href="x2go.x2go_exceptions-pysrc.html#X2goUserException">source code</a></span></p>
+<h1 class="epydoc">Class WindowsError</h1><p class="nomargin-top"><span class="codelink"><a href="x2go.x2go_exceptions-pysrc.html#WindowsError">source code</a></span></p>
 <pre class="base-tree">
               object --+        
                        |        
@@ -67,7 +67,7 @@ exceptions.BaseException --+
                            |    
               _X2goException --+
                                |
-                              <strong class="uidshort">X2goUserException</strong>
+                              <strong class="uidshort">WindowsError</strong>
 </pre>
 
 <hr />
diff --git a/x2go/backends/proxy/_nx3.py b/x2go/backends/proxy/_nx3.py
index e7d7a08..55dbdeb 100644
--- a/x2go/backends/proxy/_nx3.py
+++ b/x2go/backends/proxy/_nx3.py
@@ -57,6 +57,7 @@ class X2goProxyNX3(base.X2goProxyBASE):
         # setting some default environment variables, nxproxy paths etc.
         if _X2GOCLIENT_OS == "Windows":
             _nxproxy_paths = [
+                os.path.join(os.environ["ProgramFiles"], os.path.normpath("PyHoca-GUI/nxproxy/nxproxy.exe")),
                 os.path.join(os.environ["ProgramFiles"], os.path.normpath("x2goclient/nxproxy.exe")),
                 os.path.join(os.environ["ProgramFiles"], os.path.normpath("NX Client for Windows/bin/nxproxy.exe")),
             ]


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).

    