aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStevan Radaković <stevan.radakovic@linaro.org>2013-04-02 12:06:05 +0200
committerStevan Radaković <stevan.radakovic@linaro.org>2013-04-02 12:06:05 +0200
commit589e29c73fab2b58fe4e9a6a4a4ff24aba6023c9 (patch)
tree2cf30e6336efd42f398f550be8670cc2dfdb55ba
parentc2d1bfec49b004cc7f850d39e9ad2db195868e81 (diff)
Fix rsplit usage.
-rw-r--r--rhodecode/model/repo.py16
-rw-r--r--rhodecode/model/repos_group.py16
2 files changed, 16 insertions, 16 deletions
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 4be41416..4c00219d 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -317,9 +317,9 @@ class RepoModel(BaseModel):
self.sa.add(cur_repo)
- old_system_name = "%s-%s" % (org_repo_name.rsplit("/",1)[0],
+ old_system_name = "%s-%s" % (org_repo_name.rsplit("/",1)[1],
cur_repo.repo_id)
- new_system_name = "%s-%s" % (new_name.rsplit("/",1)[0],
+ new_system_name = "%s-%s" % (new_name.rsplit("/",1)[1],
cur_repo.repo_id)
SystemCommand.rename_group(old_system_name, new_system_name)
@@ -378,7 +378,7 @@ class RepoModel(BaseModel):
self.sa.add(new_repo)
- system_group_name = "%s-%s" % (new_repo.repo_name.rsplit("/",1)[0],
+ system_group_name = "%s-%s" % (new_repo.repo_name.rsplit("/",1)[1],
new_repo.repo_id)
SystemCommand.add_group(system_group_name)
create_path = os.path.join(self.repos_path, new_repo.repo_name)
@@ -524,7 +524,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)[0],
+ system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[1],
repo.repo_id)
repo_path = os.path.join(self.repos_path, repo.repo_name)
if permission.permission_name in ["group.none", "group.read"]:
@@ -559,7 +559,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)[0],
+ system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[1],
repo.repo_id)
SystemCommand.remove_user_from_group(system_group_name, user.username)
@@ -593,7 +593,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)[0],
+ system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[1],
repo.repo_id)
for user in group_name.members:
if permission.permission_name in ["group.none", "group.read"]:
@@ -622,7 +622,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)[0],
+ system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[1],
repo.repo_id)
for user in group_name.members:
SystemCommand.remove_user_from_group(system_group_name,
@@ -736,6 +736,6 @@ class RepoModel(BaseModel):
_d = os.path.join(*args)
shutil.move(rm_path, os.path.join(self.repos_path, _d))
- system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0],
+ system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[1],
repo.repo_id)
SystemCommand.delete_group(system_group_name)
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
index 644b4075..c8a5639c 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)[0],
+ system_group_name = "%s-%s" % (group.group_name.rsplit("/",1)[1],
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)[0],
+ system_group_name = "%s-%s" % (group_name.rsplit("/",1)[1],
new_repos_group.group_id)
SystemCommand.add_group(system_group_name)
create_path = os.path.join(self.repos_path, group_name)
@@ -281,9 +281,9 @@ class ReposGroupModel(BaseModel):
self.__rename_group(old_path, new_path)
- old_system_name = "%s-%s" % (old_path.rsplit("/",1)[0],
+ old_system_name = "%s-%s" % (old_path.rsplit("/",1)[1],
repos_group.group_id)
- new_system_name = "%s-%s" % (new_path.rsplit("/",1)[0],
+ new_system_name = "%s-%s" % (new_path.rsplit("/",1)[1],
repos_group.group_id)
SystemCommand.rename_group(old_system_name, new_system_name)
@@ -369,7 +369,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)[0],
+ system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1],
repos_group.group_id)
group_path = os.path.join(self.repos_path, repos_group.group_name)
@@ -406,7 +406,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)[0],
+ system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1],
repos_group.group_id)
SystemCommand.remove_user_from_group(system_group_name, user.username)
@@ -441,7 +441,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)[0],
+ system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1],
repos_group.group_id)
for user in group_name.members:
@@ -472,7 +472,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)[0],
+ system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1],
repos_group.group_id)
for user in group_name.members:
SystemCommand.remove_user_from_group(system_group_name,