[X2Go-Commits] [x2gobroker] 10/18: x2gobroker-loadchecker: No chown/chmod if we are not running as root (which is mostly the case).
git-admin at x2go.org
git-admin at x2go.org
Mon Apr 30 19:10:56 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gobroker.
commit 220eacea480d79a483756bd6a3eeecbc7726915e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Apr 30 17:14:41 2018 +0200
x2gobroker-loadchecker: No chown/chmod if we are not running as root (which is mostly the case).
---
sbin/x2gobroker-loadchecker | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sbin/x2gobroker-loadchecker b/sbin/x2gobroker-loadchecker
index 49f55ba..731c20c 100755
--- a/sbin/x2gobroker-loadchecker
+++ b/sbin/x2gobroker-loadchecker
@@ -111,8 +111,11 @@ class LoadCheckerService(asyncore.dispatcher_with_send):
self.create_socket(socket.AF_UNIX, socket.SOCK_STREAM)
self.set_reuse_addr()
self.bind(socketfile)
- os.chown(socketfile, getpwnam(owner).pw_uid, getgrnam(group_owner).gr_gid)
- os.chmod(socketfile, int(permissions, 8))
+ try:
+ os.chown(socketfile, getpwnam(owner).pw_uid, getgrnam(group_owner).gr_gid)
+ os.chmod(socketfile, int(permissions, 8))
+ except OSError:
+ pass
self.listen(1)
def handle_accept(self):
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
More information about the x2go-commits
mailing list