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

Merge pull request #1332 from jberry-suse/pkglistgen-post-deploy-spec-and-bug

Browse Source 
pkglistgen: post deployment spec requirement and bug fixes
This commit is contained in:
Jimmy Berry 2018-01-09 17:33:28 -06:00 committed by GitHub
commit 29108bd463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/package/openSUSE-release-tools.spec vendored
View File

@ -60,6 +60,8 @@ Requires: python-PyYAML
Requires: python-cmdln Requires: python-cmdln
Requires: python-colorama Requires: python-colorama
Requires: python-lxml Requires: python-lxml
# issue-diff.py, legal-auto.py, and openqa-maintenance.py
Requires: python-requests
Requires: python-pycurl Requires: python-pycurl
Requires: python-python-dateutil Requires: python-python-dateutil
Requires: python-pyxdg Requires: python-pyxdg
@ -203,6 +205,7 @@ Group: Development/Tools/Other
BuildArch: noarch BuildArch: noarch
Requires: osclib = %{version} Requires: osclib = %{version}
Requires: obs-service-product_converter Requires: obs-service-product_converter
Requires: python-requests
Requires: python-solv Requires: python-solv
# we use the same user as repo-checker # we use the same user as repo-checker
PreReq: openSUSE-release-tools-repo-checker PreReq: openSUSE-release-tools-repo-checker
@ -368,6 +371,7 @@ fi
%exclude %{_datadir}/%{source_dir}/manager_42.py %exclude %{_datadir}/%{source_dir}/manager_42.py
%exclude %{_datadir}/%{source_dir}/metrics %exclude %{_datadir}/%{source_dir}/metrics
%exclude %{_datadir}/%{source_dir}/metrics.py %exclude %{_datadir}/%{source_dir}/metrics.py
%exclude %{_datadir}/%{source_dir}/pkglistgen.py
%exclude %{_datadir}/%{source_dir}/repo_checker.pl %exclude %{_datadir}/%{source_dir}/repo_checker.pl
%exclude %{_datadir}/%{source_dir}/repo_checker.py %exclude %{_datadir}/%{source_dir}/repo_checker.py
%exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py %exclude %{_datadir}/%{source_dir}/suppkg_rebuild.py
@ -483,6 +487,7 @@ fi
%files pkglistgen %files pkglistgen
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_bindir}/osrt-pkglistgen %{_bindir}/osrt-pkglistgen
%{_datadir}/%{source_dir}/pkglistgen.py
%{_unitdir}/osrt-pkglistgen@.service %{_unitdir}/osrt-pkglistgen@.service
%{_unitdir}/osrt-pkglistgen@.timer %{_unitdir}/osrt-pkglistgen@.timer

5
pkglistgen.py
View File

@ -63,6 +63,7 @@ from osclib.memoize import CACHEDIR
logger = logging.getLogger() logger = logging.getLogger()
SCRIPT_PATH = os.path.dirname(os.path.realpath(__file__))
ARCHITECTURES = ['x86_64', 'ppc64le', 's390x', 'aarch64'] ARCHITECTURES = ['x86_64', 'ppc64le', 's390x', 'aarch64']
DEFAULT_REPOS = ("openSUSE:Factory/standard") DEFAULT_REPOS = ("openSUSE:Factory/standard")
PRODUCT_SERVICE = '/usr/lib/obs/service/create_single_product' PRODUCT_SERVICE = '/usr/lib/obs/service/create_single_product'
@ -717,7 +718,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
""" """
# only there to parse the repos # only there to parse the repos
bs_mirrorfull = os.path.join(os.path.dirname(__file__), 'bs_mirrorfull') bs_mirrorfull = os.path.join(SCRIPT_PATH, 'bs_mirrorfull')
global_update = False global_update = False
for prp in self.tool.repos: for prp in self.tool.repos:
project, repo = prp.split('/') project, repo = prp.split('/')
@ -1011,7 +1012,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
# DVD project first since it depends on main. # DVD project first since it depends on main.
if api.rings: if api.rings:
opts_dvd = copy.deepcopy(opts) opts_dvd = copy.deepcopy(opts)
opts.project += ':DVD' opts_dvd.project += ':DVD'
self.options.repos.insert(0, '/'.join([opts.project, main_repo])) self.options.repos.insert(0, '/'.join([opts.project, main_repo]))
self.update_and_solve_target(apiurl, target_project, target_config, main_repo, opts_dvd, skip_release=True) self.update_and_solve_target(apiurl, target_project, target_config, main_repo, opts_dvd, skip_release=True)