From 41e24f3d972581849926d2214b0e292b13e132b8 Mon Sep 17 00:00:00 2001
From: Sam Gleske <sag47@drexel.edu>
Date: Thu, 30 Jan 2014 21:30:59 -0500
Subject: [PATCH] findgroups function working
---
.gitignore | 1 +
lib/manage_gitlab_project.py | 18 +++++++++---------
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/.gitignore b/.gitignore
index 3a26abf..6f49fe3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
config.sh
*.pyc
+*.swp
diff --git a/lib/manage_gitlab_project.py b/lib/manage_gitlab_project.py
index e297434..0e993d3 100755
--- a/lib/manage_gitlab_project.py
+++ b/lib/manage_gitlab_project.py
@@ -6,7 +6,7 @@
from sys import argv,exit,stderr
from optparse import OptionParser
import os
-import gitlab
+import gitlab3 as gitlab
@@ -38,14 +38,14 @@ elif len(args) > 1:
project_name=args[0]
-git=gitlab.Gitlab(host=gitlab_url,user=gitlab_user,token=token_secret)
+git=gitlab.Gitlab(gitlab_url,token_secret)
def findgroup(gname):
#Locate the group
page=1
- while len(git.getgroups(page=page)) > 0:
- for group in git.getgroups(page=page):
- if group['name'] == gname:
+ while len(git.groups(page=page)) > 0:
+ for group in git.groups(page=page):
+ if group.name == gname:
return group
page += 1
else:
@@ -55,11 +55,11 @@ def findgroup(gname):
def findproject(gname,pname,user=False):
page=1
- while len(git.getprojects(page=page)) > 0:
- for project in git.getprojects(page=page):
- if not user and project['namespace']['name'] == gname and project['name'] == pname:
+ while len(git.projects(page=page,per_page=20)) > 0:
+ for project in git.projects(page=page,per_page=20):
+ 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:
+ elif user and project.namespace['path'] == gname and project.name == pname:
return project
page += 1
else:
--
GitLab