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

Merge pull request #2547 from sysrich/master

Browse Source 
Revert pkglistgen: ignore bootstrap_copy repo
This commit is contained in:
Stephan Kulow 2021-04-08 12:35:04 +02:00 committed by GitHub
commit b593b12c96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osclib/conf.py
View File

@ -42,7 +42,6 @@ DEFAULT = {
'repo_checker-package-comment-devel': 'True', 'repo_checker-package-comment-devel': 'True',
'pkglistgen-product-family-include': 'openSUSE:Leap:N', 'pkglistgen-product-family-include': 'openSUSE:Leap:N',
'pkglistgen-locales-from': 'openSUSE.product.in', 'pkglistgen-locales-from': 'openSUSE.product.in',
'pkglistgen-ignore_repos': 'bootstrap_copy',
'mail-list': 'opensuse-factory@opensuse.org', 'mail-list': 'opensuse-factory@opensuse.org',
'mail-maintainer': 'Dominique Leuenberger <dimstar@suse.de>', 'mail-maintainer': 'Dominique Leuenberger <dimstar@suse.de>',
'mail-noreply': 'noreply@opensuse.org', 'mail-noreply': 'noreply@opensuse.org',
@ -97,7 +96,6 @@ DEFAULT = {
'pkglistgen-archs': 'x86_64', 'pkglistgen-archs': 'x86_64',
'pkglistgen-scopes': 'target rings staging', 'pkglistgen-scopes': 'target rings staging',
'pkglistgen-locales-from': 'openSUSE.product', '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-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', 'pkglistgen-delete-kiwis-staging': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi',
'mail-list': 'opensuse-factory@opensuse.org', 'mail-list': 'opensuse-factory@opensuse.org',
@ -160,7 +158,6 @@ DEFAULT = {
'pkglistgen-archs': 'x86_64 aarch64 ppc64le s390x', 'pkglistgen-archs': 'x86_64 aarch64 ppc64le s390x',
'pkglistgen-scopes': 'target', 'pkglistgen-scopes': 'target',
'pkglistgen-locales-from': 'openSUSE.product', 'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-ignore_repos': 'bootstrap_copy',
}, },
# Allows devel projects to utilize tools that require config, but not # Allows devel projects to utilize tools that require config, but not
# complete StagingAPI support. # complete StagingAPI support.

3
pkglistgen/tool.py
View File

@ -596,8 +596,7 @@ class PkgListGen(ToolBase.ToolBase):
project, scope, force, no_checkout, project, scope, force, no_checkout,
only_release_packages, stop_after_solve): only_release_packages, stop_after_solve):
self.all_architectures = target_config.get('pkglistgen-archs').split(' ') self.all_architectures = target_config.get('pkglistgen-archs').split(' ')
ignore_repos = set(target_config.get('pkglistgen-ignore_repos', '').split(' ')) self.repos = self.expand_repos(project, main_repo)
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)) print('[{}] {}/{}: update and solve'.format(scope, project, main_repo))
group = target_config.get('pkglistgen-group', '000package-groups') group = target_config.get('pkglistgen-group', '000package-groups')