From 378470e8c9ece5d4d42754baa8c281ff8303b1a0 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Mon, 5 Feb 2018 19:44:21 -0600 Subject: [PATCH] osclib/stagingapi: get_staging_projects(): utilize project_list_prefix(). --- osclib/stagingapi.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 6fa31ea12..cc8336660 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -49,6 +49,7 @@ from osclib.cache import Cache from osclib.core import devel_project_get +from osclib.core import project_list_prefix from osclib.comments import CommentAPI from osclib.ignore_command import IgnoreCommand from osclib.memoize import memoize @@ -333,17 +334,10 @@ def get_staging_projects(self, include_dvd=True): :return list of known staging projects """ - projects = [] + projects = project_list_prefix(self.apiurl, self.cstaging) + if not include_dvd: + projects = filter(lambda p: not p.endswith(':DVD'), projects) - query = "id?match=starts-with(@name,'{}:')".format(self.cstaging) - url = self.makeurl(['search', 'project', query]) - projxml = http_GET(url) - root = ET.parse(projxml).getroot() - for val in root.findall('project'): - project = val.get('name') - if not include_dvd and project.endswith(':DVD'): - continue - projects.append(project) return projects def extract_staging_short(self, p):