[Checkins] SVN: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/ Forward-port r97440 from the 1.5 branch.

[Tres Seaver]

Log message for revision 118211:
  Forward-port r97440 from the 1.5 branch.

Changed:
  U   Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt
  U   Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBGroupManager.py

-=-
Modified: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt	2010-11-04 18:23:58 UTC (rev 118210)
+++ Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/doc/CHANGES.txt	2010-11-04 19:38:10 UTC (rev 118211)
@@ -4,6 +4,8 @@
 PluggableAuthService 1.6.4 (unreleased)
 ---------------------------------------
 
+- Don't fail on users defined in multiple user sources on the ZODBGroupManager
+  listing page.
 
 PluggableAuthService 1.6.3 (2010-02-01)
 ---------------------------------------

Modified: Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBGroupManager.py
===================================================================
--- Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBGroupManager.py	2010-11-04 18:23:58 UTC (rev 118210)
+++ Products.PluggableAuthService/branches/1.6/Products/PluggableAuthService/plugins/ZODBGroupManager.py	2010-11-04 19:38:10 UTC (rev 118211)
@@ -250,14 +250,12 @@
 
         for k, v in self._principal_groups.items():
             if group_id in v:
-                # should be one and only one mapping to 'k'
-
                 parent = aq_parent( self )
                 info = parent.searchPrincipals( id=k, exact_match=True )
-                assert( len( info ) in ( 0, 1 ) )
                 if len( info ) == 0:
                     title = '<%s: not found>' % k
                 else:
+                    # always use the title of the first principal found
                     title = info[0].get( 'title', k )
                 result.append( ( k, title ) )