Skip to content

Commit 68f90c2

Browse files
author
Alexander Smishlajev
committed
allow ids in addition to names for -g and -u arguments;
fix vim modeline: this form must be terminated with colon, use softtabstop instead of tabstop
1 parent 442902b commit 68f90c2

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

roundup/scripts/roundup_server.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
"""Command-line script that runs a server over roundup.cgi.client.
1919
20-
$Id: roundup_server.py,v 1.53 2004-07-02 08:52:00 a1s Exp $
20+
$Id: roundup_server.py,v 1.54 2004-07-04 12:52:06 a1s Exp $
2121
"""
2222
__docformat__ = 'restructuredtext'
2323

@@ -492,7 +492,12 @@ def run(port=PORT, success_message=None):
492492
except ImportError:
493493
raise ValueError, _("Can't change groups - no grp module")
494494
try:
495-
gid = grp.getgrnam(group)[2]
495+
try:
496+
gid = int(group)
497+
except ValueError:
498+
gid = grp.getgrnam(group)[2]
499+
else:
500+
grp.getgrgid(gid)
496501
except KeyError:
497502
raise ValueError,_("Group %(group)s doesn't exist")%locals()
498503
os.setgid(gid)
@@ -507,7 +512,12 @@ def run(port=PORT, success_message=None):
507512
except ImportError:
508513
raise ValueError, _("Can't change users - no pwd module")
509514
try:
510-
uid = pwd.getpwnam(user)[2]
515+
try:
516+
uid = int(user)
517+
except ValueError:
518+
uid = pwd.getpwnam(user)[2]
519+
else:
520+
pwd.getpwuid(uid)
511521
except KeyError:
512522
raise ValueError, _("User %(user)s doesn't exist")%locals()
513523
os.setuid(uid)
@@ -569,4 +579,4 @@ def run(port=PORT, success_message=None):
569579
if __name__ == '__main__':
570580
run()
571581

572-
# vim: set filetype=python ts=4 sw=4 et si
582+
# vim: set filetype=python sts=4 sw=4 et si :

0 commit comments

Comments
 (0)