[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.1.1.4-156-g81d6688

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:57:20 CEST 2013


The branch, twofactorauth has been updated
       via  81d66886804c60d7a5f0ec035a7d03afe622d642 (commit)
      from  fdfd1f388eaee05a77ef928664ba2f7c6c2b8bb1 (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 |    1 +
 x2go/defaults.py |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 33797eb..6f58069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,7 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe.
     - For the Windows version, make VcXsrv-Server at the development location
       known to Python X2Go.
+    - Normalize paths to configuration files.
   * Depend on python-xlib.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 Sep 2012 01:44:21 +0100
diff --git a/x2go/defaults.py b/x2go/defaults.py
index afc5de3..29577fe 100644
--- a/x2go/defaults.py
+++ b/x2go/defaults.py
@@ -151,23 +151,23 @@ BACKEND_CLIENTPRINTING_DEFAULT = 'X2goClientPrintingFILE'
 
 X2GO_SETTINGS_FILENAME = 'settings'
 X2GO_SETTINGS_CONFIGFILES = [
-    os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'settings'),
-    os.path.join(ETC_DIR,X2GO_SETTINGS_FILENAME),
+    os.normpath(os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'settings')),
+    os.normpath(os.path.join(ETC_DIR,X2GO_SETTINGS_FILENAME)),
 ]
 X2GO_PRINTING_FILENAME = 'printing'
 X2GO_PRINTING_CONFIGFILES = [
-    os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'printing'),
-    os.path.join(ETC_DIR,X2GO_PRINTING_FILENAME),
+    os.normpath(os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'printing')),
+    os.normpath(os.path.join(ETC_DIR,X2GO_PRINTING_FILENAME)),
 ]
 X2GO_SESSIONPROFILES_FILENAME = 'sessions'
 X2GO_SESSIONPROFILES_CONFIGFILES = [
-    os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'sessions'),
-    os.path.join(ETC_DIR,X2GO_SESSIONPROFILES_FILENAME),
+    os.normpath(os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'sessions')),
+    os.normpath(os.path.join(ETC_DIR,X2GO_SESSIONPROFILES_FILENAME)),
 ]
 X2GO_XCONFIG_FILENAME = 'xconfig'
 X2GO_XCONFIG_CONFIGFILES = [
-    os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'xconfig'),
-    os.path.join(ETC_DIR,X2GO_XCONFIG_FILENAME),
+    os.normpath(os.path.join(LOCAL_HOME, X2GO_CLIENT_ROOTDIR, 'xconfig')),
+    os.normpath(os.path.join(ETC_DIR,X2GO_XCONFIG_FILENAME)),
 ]
 
 X2GO_CLIENTSETTINGS_DEFAULTS = {


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




More information about the x2go-commits mailing list