This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch 3.6.x-rpm-debug in repository nx-libs. from 2e64034 nxcompshad/src/Makefile.am: implement libX11 RPATH/RUNPATH override. adds 56dbc21 nxcomp/src/Log.h: make sure we don't pass NULL pointers to strstr(). new e8859e0 Merge branch '3.6.x' into 3.6.x-rpm-debug new c2ff944 nxcomp/src/Log.cpp: don't confuse users with useless warning messages in case that a log line append operation was requested, but the message level has lower precedence than the current log filter. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: nxcomp/src/Log.cpp | 20 ++++++++++++-------- nxcomp/src/Log.h | 9 ++++++++- 2 files changed, 20 insertions(+), 9 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit e8859e090edb911494023bf224f6654aed66be9c Merge: 2e64034 56dbc21 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 27 19:50:46 2017 +0100 Merge branch '3.6.x' into 3.6.x-rpm-debug nxcomp/src/Log.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x-rpm-debug in repository nx-libs. commit c2ff944aaca3c2cc580cd772a154fe977fc02ca4 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 27 20:12:26 2017 +0100 nxcomp/src/Log.cpp: don't confuse users with useless warning messages in case that a log line append operation was requested, but the message level has lower precedence than the current log filter. --- nxcomp/src/Log.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/nxcomp/src/Log.cpp b/nxcomp/src/Log.cpp index a3a7222..4a9a267 100644 --- a/nxcomp/src/Log.cpp +++ b/nxcomp/src/Log.cpp @@ -123,15 +123,19 @@ NXLog& operator<< (NXLog& out, const NXLogStamp& value) /* Appending means that the log object's internal level and the message level must match. */ if (out.current_level() == value.level()) { - /* And the buffer must of course be non-empty. */ - if (out.has_buffer()) + /* Discard, if the message is not supposed to be written out anyway. */ + if (out.will_log ()) { - out << " (cont.) "; - } - else - { - std::cerr << "WARNING: Append operation requested, but no queued data available. " - << "Internal state error!\n" << "Log line will be discarded!" << std::endl; + /* And the buffer must of course be non-empty. */ + if (out.has_buffer()) + { + out << " (cont.) "; + } + else + { + std::cerr << "WARNING: Append operation requested, but no queued data available. " + << "Internal state error!\n" << "Log line will be discarded!" << std::endl; + } } } else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
-
git-admin＠x2go.org