From facb6fecf6889a35b11d1f8683e0676748edd27b Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Thu, 21 Dec 2017 00:31:01 -0600 Subject: [PATCH] osclib/stagingapi: provide is_staging_bootstrapped() from request_splitter. --- osclib/request_splitter.py | 11 +---------- osclib/stagingapi.py | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/osclib/request_splitter.py b/osclib/request_splitter.py index 209017aa..6c7fe0a2 100644 --- a/osclib/request_splitter.py +++ b/osclib/request_splitter.py @@ -176,15 +176,6 @@ class RequestSplitter(object): return '00' return '__'.join(key) - def is_staging_bootstrapped(self, project): - if self.api.rings: - # Determine if staging is bootstrapped. - meta = self.api.get_prj_meta(project) - xpath = 'link[@project="{}"]'.format(self.api.rings[0]) - return meta.find(xpath) is not None - - return False - def is_staging_mergeable(self, status, pseudometa): return len(pseudometa['requests']) > 0 and 'splitter_info' in pseudometa @@ -238,7 +229,7 @@ class RequestSplitter(object): for staging in stagings: project = self.api.prj_from_short(staging) status, pseudometa = self.staging_status_load(project) - bootstrapped = self.is_staging_bootstrapped(project) + bootstrapped = self.api.is_staging_bootstrapped(project) # Store information about staging. self.stagings[staging] = { diff --git a/osclib/stagingapi.py b/osclib/stagingapi.py index 24213563..709ae78b 100644 --- a/osclib/stagingapi.py +++ b/osclib/stagingapi.py @@ -1811,3 +1811,12 @@ class StagingAPI(object): break_long_words=False) return None + + def is_staging_bootstrapped(self, project): + if self.rings: + # Determine if staging is bootstrapped. + meta = self.get_prj_meta(project) + xpath = 'link[@project="{}"]'.format(self.rings[0]) + return meta.find(xpath) is not None + + return False