Mercurial > kallithea

changeset 1986:367d76f5fcf5 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added re-creation of permissions into step4 upgrade
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 07 Feb 2012 07:32:16 +0200
parents 40f04021fa61
children 77b5c24f1887
files rhodecode/lib/db_manage.py
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/lib/db_manage.py	Tue Feb 07 07:23:31 2012 +0200
+++ b/rhodecode/lib/db_manage.py	Tue Feb 07 07:32:16 2012 +0200
@@ -172,6 +172,7 @@
 
             def step_4(self):
                 print ('TODO:')
+                self.create_permissions()
                 self.klass.fixup_groups()
 
         upgrade_steps = [0] + range(curr_version + 1, __dbversion__ + 1)
@@ -483,10 +484,11 @@
         ]
 
         for p in perms:
-            new_perm = Permission()
-            new_perm.permission_name = p[0]
-            new_perm.permission_longname = p[1]
-            self.sa.add(new_perm)
+            if not Permission.get_by_key(p):
+                new_perm = Permission()
+                new_perm.permission_name = p[0]
+                new_perm.permission_longname = p[1]
+                self.sa.add(new_perm)
 
     def populate_default_permissions(self):
         log.info('creating default user permissions')