Skip to content

Commit

Permalink
pkglistgen: ignore bootstrap_copy repo
Browse files Browse the repository at this point in the history
Never use the bootstrap_copy repo for package solving. Staging content
might be very different so don't confuse the solver.
  • Loading branch information
lnussel committed Mar 29, 2021
1 parent a747e49 commit 1cf026a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions osclib/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
'repo_checker-package-comment-devel': 'True',
'pkglistgen-product-family-include': 'openSUSE:Leap:N',
'pkglistgen-locales-from': 'openSUSE.product.in',
'pkglistgen-ignore_repos': 'bootstrap_copy',
'mail-list': 'opensuse-factory@opensuse.org',
'mail-maintainer': 'Dominique Leuenberger <dimstar@suse.de>',
'mail-noreply': 'noreply@opensuse.org',
Expand Down Expand Up @@ -96,6 +97,7 @@
'pkglistgen-archs': 'x86_64',
'pkglistgen-scopes': 'target rings staging',
'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-ignore_repos': 'bootstrap_copy',
'pkglistgen-delete-kiwis-rings': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi',
'pkglistgen-delete-kiwis-staging': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi',
'mail-list': 'opensuse-factory@opensuse.org',
Expand Down Expand Up @@ -158,6 +160,7 @@
'pkglistgen-archs': 'x86_64 aarch64 ppc64le s390x',
'pkglistgen-scopes': 'target',
'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-ignore_repos': 'bootstrap_copy',
},
# Allows devel projects to utilize tools that require config, but not
# complete StagingAPI support.
Expand Down
3 changes: 2 additions & 1 deletion pkglistgen/tool.py
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,8 @@ def update_and_solve_target(self, api, target_project, target_config, main_repo,
project, scope, force, no_checkout,
only_release_packages, stop_after_solve):
self.all_architectures = target_config.get('pkglistgen-archs').split(' ')
self.repos = self.expand_repos(project, main_repo)
ignore_repos = set(target_config.get('pkglistgen-ignore_repos').split(' '))
self.repos = [ r for r in self.expand_repos(project, main_repo) if r[0] != project or r[1] not in ignore_repos ]
print('[{}] {}/{}: update and solve'.format(scope, project, main_repo))

group = target_config.get('pkglistgen-group', '000package-groups')
Expand Down

0 comments on commit 1cf026a

Please sign in to comment.