##// END OF EJS Templates
acl: improve undefined group error handling
Patrick Mezard -
r11140:1f26cf0a default
parent child Browse files
Show More
@@ -161,7 +161,10 b' def _getusers(ui, group):'
161
161
162 ui.debug('acl: "%s" not defined in [acl.groups]\n' % group)
162 ui.debug('acl: "%s" not defined in [acl.groups]\n' % group)
163 # If no users found in group definition, get users from OS-level group
163 # If no users found in group definition, get users from OS-level group
164 return util.groupmembers(group)
164 try:
165 return util.groupmembers(group)
166 except KeyError:
167 raise util.Abort(_("group '%s' is undefined") % group)
165
168
166 def _usermatch(ui, user, usersorgroups):
169 def _usermatch(ui, user, usersorgroups):
167
170
@@ -165,4 +165,12 b' echo "foo/Bar/** = @group1" >> $config'
165 echo "@group is allowed inside anything but foo/Bar/"
165 echo "@group is allowed inside anything but foo/Bar/"
166 do_push fred
166 do_push fred
167
167
168 echo 'Invalid group'
169 # Disable the fakegroups trick to get real failures
170 grep -v fakegroups $config > config.tmp
171 mv config.tmp $config
172 echo '[acl.allow]' >> $config
173 echo "** = @unlikelytoexist" >> $config
174 do_push fred 2>&1 | grep unlikelytoexist
168
175
176 true
@@ -1557,3 +1557,8 b' abort: acl: access denied for changeset '
1557 no rollback information available
1557 no rollback information available
1558 0:6675d58eff77
1558 0:6675d58eff77
1559
1559
1560 Invalid group
1561 ** = @unlikelytoexist
1562 acl: "unlikelytoexist" not defined in [acl.groups]
1563 error: pretxnchangegroup.acl hook failed: group 'unlikelytoexist' is undefined
1564 abort: group 'unlikelytoexist' is undefined
General Comments 0
You need to be logged in to leave comments. Login now