Skip to content

Commit

Permalink
[module] Move 'hotfixes' conf option to libdnf and rename it to 'modu…
Browse files Browse the repository at this point in the history
…le_hotfixes'.
  • Loading branch information
Daniel Mach authored and j-mracek committed Jul 27, 2018
1 parent 5ab8916 commit 2d40e2c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion dnf/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def update_include_nevras(name, stream):
exclude_nevras_set.update(exclude_set)

# collect all hotfix repo repoids - we don't filter them at all
hotfix_repos = [i.id for i in self.repos.iter_enabled() if i.hotfixes._get()]
hotfix_repos = [i.id for i in self.repos.iter_enabled() if i.module_hotfixes]
hotfix_repos.extend([hawkey.SYSTEM_REPO_NAME, hawkey.CMDLINE_REPO_NAME])

# collect all RPM $names for bare RPMs filtering
Expand Down
4 changes: 0 additions & 4 deletions dnf/conf/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -590,10 +590,6 @@ def __init__(self, parent, section=None, parser=None):
parent._config if parent else cfg.ConfigMain()), section, parser)
self._masterConfig = parent._config if parent else cfg.ConfigMain()

# modularity
# TODO move to libdnf
self.hotfixes = BoolOption(False)

def _configure_from_options(self, opts):
"""Configure repos from the opts. """

Expand Down
10 changes: 10 additions & 0 deletions doc/conf_ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,16 @@ or :ref:`mirrorlist <mirrorlist-label>` option definition.

URL of a mirrorlist for the repository.

.. _module_hotfixes-label:

``module_hofixes``
:ref:`boolean <boolean-label>`

Set this to True to disable module RPM filtering and make all RPMs from the repository available. The default is False.
This allows user to create a repository with cherry-picked hotfixes that are included in a package set on a modular system.

.. _mirrorlist-label:

``name``
:ref:`string <string-label>`

Expand Down

0 comments on commit 2d40e2c

Please sign in to comment.