This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from bae28fa src/onmainwindow.cpp: QProcess:nullDevice () is only available on Qt 5.2+, so use a workaround for older versions. new 9ad7066 src/onmainwindow.cpp: actually pass the correct group ID to the chgrp call and make sure that the warning dialog box also appears whenever the exit code indicates a failure. The 1 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: debian/changelog | 3 +++ src/onmainwindow.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 9ad7066bd0d81108e0609052c70dee3b60bf9f63 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jun 14 13:04:53 2018 +0200 src/onmainwindow.cpp: actually pass the correct group ID to the chgrp call and make sure that the warning dialog box also appears whenever the exit code indicates a failure. --- debian/changelog | 3 +++ src/onmainwindow.cpp | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28cc63d..de521ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -90,6 +90,9 @@ x2goclient (4.1.2.0-0x2go1) UNRELEASED; urgency=medium to work around a Cygwin permissions bug. Fixes: #1156. - src/onmainwindow.cpp: QProcess:nullDevice () is only available on Qt 5.2+, so use a workaround for older versions. + - src/onmainwindow.cpp: actually pass the correct group ID to the chgrp + call and make sure that the warning dialog box also appears whenever the + exit code indicates a failure. * x2goclient.spec: - Remove plugin references. * debian/rules: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 502415e..20f46e2 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -10429,7 +10429,7 @@ void ONMainWindow::workaround_cygwin_permissions_issue () { QString etc_dir = cygwinPath (wapiShortFileName (homeDir + "/.x2go/etc")); QStringList args; - args << "-R" << "-v" << etc_dir; + args << "-R" << "-v" << "197121" << etc_dir; QProcess chgrp; chgrp.setStandardInputFile ( @@ -10492,7 +10492,8 @@ void ONMainWindow::workaround_cygwin_permissions_issue () { QCoreApplication::processEvents (QEventLoop::AllEvents, 10); } - fail = ((fail) || (QProcess::NormalExit != chgrp.exitStatus ())); + fail = ((fail) || (QProcess::NormalExit != chgrp.exitStatus ()) + || ((QProcess::NormalExit == chgrp.exitStatus ()) && (chgrp.exitCode ()))); if (fail) { show_RichText_WarningMsgBox (tr ("Execution failure of chgrp helper."), -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org