Skip to content
Snippets Groups Projects
Commit 53d72f28 authored by Sam Gleske's avatar Sam Gleske
Browse files

Merge branch 'release' into development for fixing move bug

parents ba6ef2c2 2de964f6
No related branches found
No related tags found
No related merge requests found
...@@ -56,11 +56,13 @@ def findgroup(gname): ...@@ -56,11 +56,13 @@ def findgroup(gname):
print >> stderr, "gitlab-mirrors will not automatically create the project namespace." print >> stderr, "gitlab-mirrors will not automatically create the project namespace."
exit(1) exit(1)
def findproject(gname,pname): def findproject(gname,pname,user=False):
page=1 page=1
while len(git.getProjects(page=page)) > 0: while len(git.getProjects(page=page)) > 0:
for project in git.getProjects(page=page): for project in git.getProjects(page=page):
if project['namespace']['name'] == gname and project['name'] == pname: if not user and project['namespace']['name'] == gname and project['name'] == pname:
return project
elif user and project['namespace']['path'] == gname and project['name'] == pname:
return project return project
page += 1 page += 1
else: else:
...@@ -76,7 +78,7 @@ def createproject(pname): ...@@ -76,7 +78,7 @@ def createproject(pname):
description=options.desc description=options.desc
new_project=git.createProject(pname,description=description,issues_enabled=int(options.issues),wall_enabled=int(options.wall),merge_requests_enabled=int(options.merge),wiki_enabled=int(options.wiki),snippets_enabled=int(options.snippets),public=int(options.public)) new_project=git.createProject(pname,description=description,issues_enabled=int(options.issues),wall_enabled=int(options.wall),merge_requests_enabled=int(options.merge),wiki_enabled=int(options.wiki),snippets_enabled=int(options.snippets),public=int(options.public))
if gitlab_user != gitlab_namespace: if gitlab_user != gitlab_namespace:
new_project=findproject(gitlab_user,pname) new_project=findproject(gitlab_user,pname,user=True)
new_project=git.moveProject(found_group['id'],new_project['id']) new_project=git.moveProject(found_group['id'],new_project['id'])
if findproject(gitlab_namespace,pname): if findproject(gitlab_namespace,pname):
return findproject(gitlab_namespace,pname) return findproject(gitlab_namespace,pname)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment