This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit def94568dc143ac8fe5402becb7aaa8a24bdbdae Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Dec 9 18:49:18 2016 +0100 src/x2goutils.cpp: add debugging output to add_to_path (). --- debian/changelog | 1 + src/x2goutils.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index d6913e1..371c1ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -487,6 +487,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium from add_to_path ()... Fixes a few bugs here and there. - src/onmainwindow.cpp: remove trailing slash from Mageia/SUSE/Arch sftp-server binary search path. + - src/x2goutils.cpp: add debugging output to add_to_path (). [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp index 5850cca..f45e79f 100644 --- a/src/x2goutils.cpp +++ b/src/x2goutils.cpp @@ -211,6 +211,8 @@ QString add_to_path (const QString &orig_path, const QStringList &add, const boo QStringList orig_path_list = orig_path.split (":"); + x2goDebug << "path value at beginning: " << orig_path; + /* * Clean up add list. We want to make sure no entry ends in a slash * and skip empty entries. @@ -231,6 +233,8 @@ QString add_to_path (const QString &orig_path, const QStringList &add, const boo } } + x2goDebug << "tmp_clean_add: " << tmp_clean_add; + /* Nothing to add, really... */ if (tmp_clean_add.isEmpty ()) { return (ret); @@ -257,6 +261,8 @@ QString add_to_path (const QString &orig_path, const QStringList &add, const boo } } + x2goDebug << "clean_add: " << clean_add; + /* Nothing to add. */ if (clean_add.isEmpty ()) { return (ret); @@ -275,6 +281,10 @@ QString add_to_path (const QString &orig_path, const QStringList &add, const boo } } + for (std::size_t i = 0; i < found.size (); ++i) { + x2goDebug << "found entry i (" << i << ") in orig_path_list (" << clean_add[i] << "): " << found[i]; + } + if (back) { for (int i = 0; i < clean_add.size (); ++i) { if (!found[i]) { @@ -290,6 +300,8 @@ QString add_to_path (const QString &orig_path, const QStringList &add, const boo } } + x2goDebug << "return value at end: " << ret; + return (ret); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git