Permalink
Browse files

call GROUPLIST_PGM before determining user_roles()...

thanks to Stephane Chazelas [1]

[1]: https://groups.google.com/d/topic/gitolite/gy_ZkrxGSjg
  • Loading branch information...
1 parent 2dbaa4d commit 0d371ac957840ba8152d5fd11357cd850ffbd76c @sitaramc committed Oct 4, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/lib/Gitolite/Conf/Load.pm
@@ -308,15 +308,15 @@ sub memberships {
}
}
+ push @ret, @{ ext_grouplist($base) } if $type eq 'user' and $rc{GROUPLIST_PGM};
+
if ( $type eq 'user' and $repo and not repo_missing($repo) ) {
# find the roles this user has when accessing this repo and add those
# in as groupnames he is a member of. You need the already existing
# memberships for this; see below this function for an example
push @ret, user_roles( $base, $repo, @ret );
}
- push @ret, @{ ext_grouplist($base) } if $type eq 'user' and $rc{GROUPLIST_PGM};
-
@ret = @{ sort_u( \@ret ) };
trace( 3, sort @ret );
return @ret;

0 comments on commit 0d371ac

Please sign in to comment.