From 2d40e2c0d1d3fc31f50f431404209a601a32bd94 Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Wed, 25 Jul 2018 17:21:46 +0200 Subject: [PATCH] [module] Move 'hotfixes' conf option to libdnf and rename it to 'module_hotfixes'. --- dnf/base.py | 2 +- dnf/conf/config.py | 4 ---- doc/conf_ref.rst | 10 ++++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dnf/base.py b/dnf/base.py index cba5a7fa3e..09ac5f0cec 100644 --- a/dnf/base.py +++ b/dnf/base.py @@ -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 diff --git a/dnf/conf/config.py b/dnf/conf/config.py index b95db1e507..bf63344405 100644 --- a/dnf/conf/config.py +++ b/dnf/conf/config.py @@ -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. """ diff --git a/doc/conf_ref.rst b/doc/conf_ref.rst index 626d77af56..ebea7857d5 100644 --- a/doc/conf_ref.rst +++ b/doc/conf_ref.rst @@ -303,6 +303,16 @@ or :ref:`mirrorlist ` option definition. URL of a mirrorlist for the repository. +.. _module_hotfixes-label: + +``module_hofixes`` + :ref:`boolean ` + + 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 `