Skip to content

Another take to use arch when selecting repo for build target #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abitrolly wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Another take to use arch when selecting repo for build target #1097

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc5828f
Use arch when selecting repo for build target
abitrolly Aug 3, 2022
e1dcec7
Fix check for no repos for arch
abitrolly Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions osc/commandline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6396,16 +6396,23 @@ def parse_repoarchdescr(self, args, noinit = False, alternative_project = None,
# only persist our own repos
Repo.tofile(repolistfile, repositories)

if not repositories:
raise oscerr.WrongArgs('no configured repos to build against')

arch_repos = sorted({r.name for r in repositories if r.arch == arg_arch})
if not arch_repos:
raise oscerr.WrongArgs('no configured repos for arch %s' % (arg_arch))

no_repo = False
repo_names = sorted({r.name for r in repositories})
if not arg_repository and repositories:
if not arg_repository:
# XXX: we should avoid hardcoding repository names
# Use a default value from config, but just even if it's available
# unless try standard, or openSUSE_Factory, or openSUSE_Tumbleweed
no_repo = True
arg_repository = repositories[-1].name
arg_repository = arch_repos[-1]
for repository in (conf.config['build_repository'], 'standard', 'openSUSE_Factory', 'openSUSE_Tumbleweed'):
if repository in repo_names:
if repository in arch_repos:
arg_repository = repository
no_repo = False
break
Expand Down