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

Merge pull request #1799 from nilxam/correct_repos_handling

Browse Source 
pkglistgen: for nonefree repo handling should update to tool's repos rather than commandline's repos
This commit is contained in:
Stephan Kulow 2018-11-20 15:14:58 +01:00 committed by GitHub
commit 1f0e92c643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkglistgen.py
View File

@ -1328,11 +1328,11 @@ class CommandLineInterface(ToolBase.CommandLineInterface):
repos_ = self.repos repos_ = self.repos
opts_nonfree = copy.deepcopy(opts) opts_nonfree = copy.deepcopy(opts)
opts_nonfree.project = nonfree opts_nonfree.project = nonfree
self.repos = self.tool.expand_repos(nonfree, main_repo) self.tool.repos = self.tool.expand_repos(nonfree, main_repo)
self.tool.update_repos(opts_nonfree) self.tool.update_repos(opts_nonfree)
# Switch repo back to main target project. # Switch repo back to main target project.
self.repos = repos_ self.tool.repos = repos_
print('-> update_merge') print('-> update_merge')
self.update_merge(nonfree if drop_list else False) self.update_merge(nonfree if drop_list else False)