aboutsummaryrefslogtreecommitdiff
path: root/gitosis/group.py
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-10-28 03:37:28 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2008-10-28 03:37:28 -0700
commitf275a5f74bd00efa5a9b4b80826d18c9d7442ff9 (patch)
treed4b1b029f2ad1632bd64162a2cdf61b73c658378 /gitosis/group.py
parentFixup whitespace. (diff)
parentUse "git shell" instead of "git-shell", for compatibility with git 1.6. (diff)
downloadgitosis-dakkar-f275a5f74bd00efa5a9b4b80826d18c9d7442ff9.tar.gz
gitosis-dakkar-f275a5f74bd00efa5a9b4b80826d18c9d7442ff9.tar.bz2
gitosis-dakkar-f275a5f74bd00efa5a9b4b80826d18c9d7442ff9.zip
Merge branch 'upstream' into gentoo
Conflicts: gitosis/run_hook.py gitosis/serve.py gitosis/test/test_run_hook.py gitosis/test/test_serve.py
Diffstat (limited to 'gitosis/group.py')
-rw-r--r--gitosis/group.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/gitosis/group.py b/gitosis/group.py
index 5c85833..5190aef 100644
--- a/gitosis/group.py
+++ b/gitosis/group.py
@@ -32,7 +32,11 @@ def _getMembership(config, user, seen):
else:
members = members.split()
- if user in members:
+ # @all is the only group where membership needs to be
+ # bootstrapped like this, anything else gets started from the
+ # username itself
+ if (user in members
+ or '@all' in members):
log.debug('found %(user)r in %(group)r' % dict(
user=user,
group=group,