← Back to branch summary

~vishvananda/nova/has_role_cache

« back to all changes in this revision

Viewing changes to nova/auth/manager.py

  • Committer: Vishvananda Ishaya
  • Date: 2011-04-05 22:58:19 UTC
  • Revision ID: vishvananda@gmail.com-20110405225819-wbyozwjypb4lvypn
remove -None for user roles

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/auth/manager.py
368
368
                return True
369
369
 
370
370
    def _build_mc_key(self, user, role, project=None):
371
 
        return str("rolecache-%s-%s-%s" % (User.safe_id(user), role,
372
 
                (Project.safe_id(project) if project else 'None')))
 
371
        role_key = str("rolecache-%s-%s" % (User.safe_id(user), role))
 
372
        if project:
 
373
            return "%s-%s" % (role_key, Project.safe_id(project))
 
374
        return role_key
373
375
 
374
376
    def _clear_mc_key(self, user, role, project=None):
375
377
        # NOTE(anthony): it would be better to delete the key