--
Stephen Gallagher
RHCE 804006346421761
Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sgallagh@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
# 0klvnl44ynkqz771
# target_branch: bzr://bzr.fedorahosted.org/bzr/python-fedora/python-\
# fedora-devel/
# testament_sha1: aae523a2b7bfd972df85f61d9660d359152beb33
# timestamp: 2010-04-19 15:12:10 -0400
# base_revision_id: toshio@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
# 7mzxred8mrovqu9m
#
# Begin patch
=== modified file 'fedora/django/auth/models.py'
--- fedora/django/auth/models.py 2010-03-15 23:22:05 +0000
+++ fedora/django/auth/models.py 2010-04-19 19:01:54 +0000
@@ -83,6 +83,19 @@
if getattr(settings, 'FAS_GENERICEMAIL', True):
u.email = u._get_email()
u.save()
+ known_groups = []
+ for group in u.groups.values():
+ known_groups.append(group['id'])
+
+ fas_groups = []
+ for group in user['approved_memberships']:
+ fas_groups.append(group['id'])
+
+ # Make sure that all FAS groups are listed in Django
+ if sorted(known_groups) == sorted(fas_groups):
+ return u;
+
+ # Some groups didn't match. Update them all
for group in user['approved_memberships']:
g = _new_group(group)
u.groups.add(g)
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaHlEPUAAbpfgAVQWeP//3cC
Cgq////wUAQGvOuicd27ZerjCSUaTAJkyA0CNTbRR6anpPRPapp6QAylNoaTxTTQAyNGgAAAAAJI
iNKan6p+ymTVPSeU9NT1HkJ6mBqAPJGQMkmpkekGmjQDQeo0AGgAAAkkIYmiU/TKelNqb0p6m0mn
6oDIMQAaOESZ2yU6T17WGjLQuJA/qV8aiGULSTaX3Aa5nnGrDUJJwjrLkPrOwzX+x3dgfnefRP3K
vaPNqPG496I7Ynu8nZxzehUfSvJ+jWSjGUKpOH70UeyI1jOXLoy7c+i6rtjp1M6hD2nG+kbybbjM
/ZVPPpzXFTjlQKzNYSflTilqTEIrKJU+0el5Uv2wPSPIfLNgnfvpz2A4YuenXSEPQtUFWsByCFhW
nrQcVfg1+IpFqGCIiZUrsclhbBpM9owtRFIUPQgv43TgeBWDO3rEAVSDpioIN6FhaPjeoJ+VBgY0
XMnlSrsHZkFeSrzqNVlAwJzsFBZGqTmLif1A28UazEvKLCWc5Fouck2BfCJadkxXMLImWBcONhsI
EgfeUKydhIsMBjnTG0pC54n5/2Q/YoniKauHkTMK6OoGxYqJKGBQemUoCsXMOE4hQ2z2nT4pjt1a
cy3Y9jNQuMArqObceKzsLgxQ7ejwaRPPB2fb1OrNn4OvfCxyTPDpD5pcuOWsGOVphBzkxTAc4HFU
ozDY2umDM7qa8B4j4WcvI6Gsq+knAnrpwkIeaS6fEx6ZTqkv9MZJP6epofW+OoWhYdADK2C2HpiH
iA+ZD0oSi8A4HM4HM5ehmzW0jTJV7Ea3D0I1Sw7hyeTOUCGz9SlTV78BLXwpqQI4I0wydEU0pFiL
E4JgxgUpIC7xldLDMglQdDuKjTEhYmRVfLqNLAs4Zk1PcwEk/Gqh5zA7TKVhff8XuL/2uxKTnvvs
2tOMt2RWpLyFpZJSREKxHoOMHy89pqNA4k1oQ0pNNoBzPuheodivJ9xNFtZk4pvUC4MtQuy3Oq61
jtAd1AZO5Qf4HsXFRL7A4ix07swpRhTJ5JXR7E2JhA/s3XLwiwZxO5WJMm2qV1CdAQlf400meHzg
aHac1bcoyJqW3M+HFMF1ZbiVhUzyfzFyF0KO5SCLIZddp2J4bzNYBySh9KdxoTK6Q+XswCFpcNMS
zDqJQsbZUwEBizIYEMzj6OK/1ZeUBuBJgjEaEAyZGK+2i0FNT0OlMHCKyFc7eWEyLB+wbIoULjDP
mqL9qoVoA0EpEXngwzDMxBDsGxQSeEhrk+oye3q3peeUgmiTLVrv9wEbVwUSZJq7ERmVcKoJU3LH
NE2aSuA70J2ksR113VkCQZFmoOqmU8vPEs/ybbdb0sj1sgald5rqvVyCQnhUy7lHVVq8fwTnNu7h
QwFPEjiv+LuSKcKEhQ8oh6g=
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/infrastructure
