diff options
author | Stevan Radaković <stevan.radakovic@linaro.org> | 2013-03-28 11:52:26 +0100 |
---|---|---|
committer | Stevan Radaković <stevan.radakovic@linaro.org> | 2013-03-28 11:52:26 +0100 |
commit | dfe2ff575dbc595cce8a156fa4f384c5fbedd0e8 (patch) | |
tree | 606f06e9723f195e8dfd3a3f41d49ca34432a9af | |
parent | 46ce2541c4dee8e40b53ad5c99749f3039c85f8e (diff) |
Wrong index for rsplit fixed.
-rw-r--r-- | rhodecode/model/repo.py | 8 | ||||
-rw-r--r-- | rhodecode/model/repos_group.py | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py index 17bd5379..b327ba58 100644 --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -509,7 +509,7 @@ class RepoModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, user, repo)) - system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1), + system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0], repo.repo_id) SystemCommand.add_user_to_group(system_group_name, user.username) repo_path = os.path.join(self.repos_path, repo.repo_name) @@ -538,7 +538,7 @@ class RepoModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm on %s on %s' % (repo, user)) - system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1), + system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0], repo.repo_id) SystemCommand.remove_user_from_group(system_group_name, user.username) @@ -572,7 +572,7 @@ class RepoModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, group_name, repo)) - system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1), + system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0], repo.repo_id) for user in group_name.members: SystemCommand.add_user_to_group(system_group_name, user.username) @@ -596,7 +596,7 @@ class RepoModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm to %s on %s' % (repo, group_name)) - system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1), + system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0], repo.repo_id) for user in group_name.members: SystemCommand.remove_user_from_group(system_group_name, diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py index 12208273..4612176f 100644 --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -142,7 +142,7 @@ class ReposGroupModel(BaseModel): group.name) shutil.move(rm_path, os.path.join(self.repos_path, _d)) - system_group_name = "%s-%s" % (group.group_name.rsplit("/",1), + system_group_name = "%s-%s" % (group.group_name.rsplit("/",1)[0], group.group_id) SystemCommand.delete_group(system_group_name) @@ -163,7 +163,7 @@ class ReposGroupModel(BaseModel): self.__create_group(new_repos_group.group_name) # Create corresponding system group. - system_group_name = "%s-%s" % (group_name.rsplit("/",1), + system_group_name = "%s-%s" % (group_name.rsplit("/",1)[0], new_repos_group.group_id) SystemCommand.add_group(system_group_name) @@ -278,9 +278,9 @@ class ReposGroupModel(BaseModel): self.__rename_group(old_path, new_path) - old_system_name = "%s-%s" % (old_path.rsplit("/",1), + old_system_name = "%s-%s" % (old_path.rsplit("/",1)[0], repos_group.group_id) - new_system_name = "%s-%s" % (new_path.rsplit("/",1), + new_system_name = "%s-%s" % (new_path.rsplit("/",1)[0], repos_group.group_id) SystemCommand.rename_group(old_system_name, new_system_name) @@ -366,7 +366,7 @@ class ReposGroupModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, user, repos_group)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1), + system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[0], repos_group.group_id) SystemCommand.add_user_to_group(system_group_name, user.username) group_path = os.path.join(self.repos_path, repos_group.group_name) @@ -396,7 +396,7 @@ class ReposGroupModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm on %s on %s' % (repos_group, user)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1), + system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[0], repos_group.group_id) SystemCommand.remove_user_from_group(system_group_name, user.username) @@ -431,7 +431,7 @@ class ReposGroupModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, group_name, repos_group)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1), + system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[0], repos_group.group_id) for user in group_name.members: SystemCommand.add_user_to_group(system_group_name, user.username) @@ -456,7 +456,7 @@ class ReposGroupModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm to %s on %s' % (repos_group, group_name)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1), + system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[0], repos_group.group_id) for user in group_name.members: SystemCommand.remove_user_from_group(system_group_name, |