Skip to content

Fix regression introduced by #638 #676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix regression introduced by #638 #676

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9d8187
Fix regression introduced by #638
olivierHa Aug 28, 2017
126ae67
Fix Pep8 E501
olivierHa Aug 28, 2017
c4ea8f8
Fix Pep8
olivierHa Aug 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions bin/diamond
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,13 @@ 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])
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
Expand Down Expand Up @@ -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__))
Expand Down