yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure sub-package also in the staged packages

Browse Source
This commit is contained in:
Max Lin 2017-04-27 18:32:34 +08:00
parent ae280be3de
commit 12a9651661
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
suppkg_rebuild.py
View File

@ -131,6 +131,25 @@ class StagingHelper(object):
return files return files
def check_multiple_specs(self, project, packages):
expanded_packages = []
for pkg in packages:
query = {'expand': 1}
url = makeurl(self.apiurl, ['source', project, pkg], query=query)
try:
root = ET.parse(http_GET(url)).getroot()
except urllib2.HTTPError, e:
if e.code == 404:
continue
raise
for en in root.findall('entry'):
if en.attrib['name'].endswith('.spec'):
print en.attrib['name'][:-5]
expanded_packages.append(en.attrib['name'][:-5])
return expanded_packages
def crawl(self): def crawl(self):
"""Main method""" """Main method"""
rebuild_data = self.load_rebuild_data(self.project + ':Staging', 'dashboard', 'support_pkg_rebuild') rebuild_data = self.load_rebuild_data(self.project + ':Staging', 'dashboard', 'support_pkg_rebuild')
@ -146,8 +165,9 @@ class StagingHelper(object):
for stg in staging_projects: for stg in staging_projects:
prj_meta = self.api.get_prj_pseudometa(stg) prj_meta = self.api.get_prj_pseudometa(stg)
prj_staged_packages = [req['package'] for req in prj_meta['requests']] prj_staged_packages = [req['package'] for req in prj_meta['requests']]
prj_expanded_packages = self.check_multiple_specs(self.project, prj_staged_packages)
for pkg in support_pkgs: for pkg in support_pkgs:
if files.get(pkg) and files.get(pkg) in prj_staged_packages: if files.get(pkg) and files.get(pkg) in prj_expanded_packages:
if files.get(pkg) not in cand_sources[stg]: if files.get(pkg) not in cand_sources[stg]:
cand_sources[stg].append(files.get(pkg)) cand_sources[stg].append(files.get(pkg))