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

pkglistgen: respect main_repo setup for other variant

Browse Source 
Respect main_repo setup for other variant eg. ARM. Also removed ports
from SCOPES.
This commit is contained in:
Max Lin 2018-08-02 17:05:16 +08:00
parent cc79ce04f0
commit ec019c42ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkglistgen.py
View File

@ -524,8 +524,8 @@ class PkgListGen(ToolBase.ToolBase):
for e in excludes:
g.ignore(self.groups[e])
def expand_repos(self, project, repo):
return StagingAPI(self.apiurl, project).expanded_repos('standard')
def expand_repos(self, project, repo='standard'):
return StagingAPI(self.apiurl, project).expanded_repos(repo)
def _check_supplements(self):
tocheck = set()
@ -686,7 +686,7 @@ class PkgListGen(ToolBase.ToolBase):
class CommandLineInterface(ToolBase.CommandLineInterface):
SCOPES = ['all', 'arm', 'target', 'rings', 'ports', 'staging']
SCOPES = ['all', 'target', 'rings', 'staging', 'arm']
def __init__(self, *args, **kwargs):
ToolBase.CommandLineInterface.__init__(self, args, kwargs)
@ -1184,7 +1184,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
main_repo = 'ports'
opts.project += ':ARM'
self.repos = self.tool.expand_repos(opts.project, main_repo)
self.update_and_solve_target_wrapper(apiurl, target_project, target_config, main_repo, opts, drop_list=True)
self.update_and_solve_target_wrapper(api, target_project, target_config, main_repo, opts, drop_list=True)
return self.error_occured
elif opts.scope == 'ports':
# TODO Continue supporting #1297, but should be abstracted.