From b9d81876ecdd89757df4cb0d9d41dd88859509b1 Mon Sep 17 00:00:00 2001 From: Olivier Hanesse Date: Mon, 28 Aug 2017 16:57:32 +0200 Subject: [PATCH 1/3] Fix regression introduced by #638 --- bin/diamond | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/diamond b/bin/diamond index f59e7d41f..8a9b70d64 100755 --- a/bin/diamond +++ b/bin/diamond @@ -204,11 +204,11 @@ def main(): # Python 2.7+ if hasattr(os, 'initgroups'): - os.initgroups(user, gid) + os.initgroups(pwd.getpwuid(uid).pw_name, gid) # Python 2.6 else: os.setgroups([e.gr_gid for e in grp.getgrall() - if user in e.gr_mem] + [gid]) + if pwd.getpwuid(uid).pw_name in e.gr_mem] + [gid]) if gid != -1 and os.getgid() != gid: # Set GID From 126ae6733d237385d8779ef7ee1dafaa7b951257 Mon Sep 17 00:00:00 2001 From: Olivier Hanesse Date: Mon, 28 Aug 2017 17:24:33 +0200 Subject: [PATCH 2/3] Fix Pep8 E501 --- bin/diamond | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/diamond b/bin/diamond index 8a9b70d64..df142c134 100755 --- a/bin/diamond +++ b/bin/diamond @@ -208,7 +208,7 @@ def main(): # Python 2.6 else: os.setgroups([e.gr_gid for e in grp.getgrall() - if pwd.getpwuid(uid).pw_name in e.gr_mem] + [gid]) + if pwd.getpwuid(uid).pw_name in e.gr_mem] + [gid]) if gid != -1 and os.getgid() != gid: # Set GID From c4ea8f8cfecb593e010de3260da82b0dc391b2d2 Mon Sep 17 00:00:00 2001 From: Olivier Hanesse Date: Mon, 28 Aug 2017 17:52:40 +0200 Subject: [PATCH 3/3] Fix Pep8 --- bin/diamond | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/diamond b/bin/diamond index df142c134..1a09dcf78 100755 --- a/bin/diamond +++ b/bin/diamond @@ -207,8 +207,10 @@ def main(): os.initgroups(pwd.getpwuid(uid).pw_name, gid) # Python 2.6 else: - os.setgroups([e.gr_gid for e in grp.getgrall() - if pwd.getpwuid(uid).pw_name in e.gr_mem] + [gid]) + os.setgroups( + [e.gr_gid for e in grp.getgrall() if pwd.getpwuid( + uid).pw_name in e.gr_mem] + [gid] + ) if gid != -1 and os.getgid() != gid: # Set GID @@ -333,6 +335,7 @@ def main(): log.error("traceback: %s" % traceback.format_exc()) sys.exit(1) + if __name__ == "__main__": if setproctitle: setproctitle(os.path.basename(__file__))