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

Merge pull request #1333 from lnussel/pkglistgen

Browse Source 
pkglistgen fixes
This commit is contained in:
Jimmy Berry 2018-01-10 16:09:34 -06:00 committed by GitHub
commit 453674ce95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osclib/conf.py
View File

@ -72,7 +72,7 @@ DEFAULT = {
'repo-checker': 'repo-checker', 'repo-checker': 'repo-checker',
'pkglistgen-archs': 'x86_64', 'pkglistgen-archs': 'x86_64',
'pkglistgen-archs-ports': 'aarch64', 'pkglistgen-archs-ports': 'aarch64',
'pkglistgen-locals-from': 'openSUSE.product', 'pkglistgen-locales-from': 'openSUSE.product',
'pkglistgen-include-suggested': '1', 'pkglistgen-include-suggested': '1',
'pkglistgen-delete-kiwis': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi', 'pkglistgen-delete-kiwis': 'openSUSE-ftp-ftp-x86_64.kiwi openSUSE-cd-mini-x86_64.kiwi',
}, },

9
pkglistgen.py
View File

@ -40,6 +40,7 @@ from osc.core import undelete_package
from osc import conf from osc import conf
from osclib.conf import Config from osclib.conf import Config
from osclib.stagingapi import StagingAPI from osclib.stagingapi import StagingAPI
from xdg.BaseDirectory import save_cache_path
import glob import glob
import solv import solv
from pprint import pprint, pformat from pprint import pprint, pformat
@ -1013,8 +1014,9 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
if api.rings: if api.rings:
opts_dvd = copy.deepcopy(opts) opts_dvd = copy.deepcopy(opts)
opts_dvd.project += ':DVD' opts_dvd.project += ':DVD'
self.options.repos.insert(0, '/'.join([opts.project, main_repo])) self.options.repos.insert(0, '/'.join([opts_dvd.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)
self.options.repos.pop(0)
self.update_and_solve_target(apiurl, target_project, target_config, main_repo, opts) self.update_and_solve_target(apiurl, target_project, target_config, main_repo, opts)
return return
@ -1054,8 +1056,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
# Cache dir specific to hostname and project. # Cache dir specific to hostname and project.
host = urlparse.urlparse(apiurl).hostname host = urlparse.urlparse(apiurl).hostname
cache_dir = os.environ.get('XDG_CACHE_HOME', os.path.expanduser('~/.cache')) cache_dir = save_cache_path('opensuse-packagelists', host, opts.project)
cache_dir = os.path.join(cache_dir, 'opensuse-packagelists', host, opts.project)
if os.path.exists(cache_dir): if os.path.exists(cache_dir):
shutil.rmtree(cache_dir) shutil.rmtree(cache_dir)
@ -1087,7 +1088,7 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
opts.ignore_recommended = bool(target_config.get('pkglistgen-ignore-recommended')) opts.ignore_recommended = bool(target_config.get('pkglistgen-ignore-recommended'))
opts.include_suggested = bool(target_config.get('pkglistgen-include-suggested')) opts.include_suggested = bool(target_config.get('pkglistgen-include-suggested'))
opts.locale = target_config.get('pkglistgen-local') opts.locale = target_config.get('pkglistgen-local')
opts.locales_from = target_config.get('pkglistgen-locals-from') opts.locales_from = target_config.get('pkglistgen-locales-from')
self.do_solve('solve', opts) self.do_solve('solve', opts)
delete_products = target_config.get('pkglistgen-delete-products', '').split(' ') delete_products = target_config.get('pkglistgen-delete-products', '').split(' ')