[X2Go-Commits] [x2goclient] 266/276: src/x2goutils.cpp: add debugging output to add_to_path ().
git-admin at x2go.org
git-admin at x2go.org
Sat Dec 31 01:35:41 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 706d8fa828bd914376bd3b9c84673abaa8bc1945
Author: Mihai Moldovan <ionic at 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 ad4cbb3..e267f2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -489,6 +489,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 542ae7e..0a01b62 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -216,6 +216,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.
@@ -236,6 +238,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);
@@ -262,6 +266,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);
@@ -280,6 +286,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]) {
@@ -295,6 +305,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
More information about the x2go-commits
mailing list