diff --git a/dnf/automatic/main.py b/dnf/automatic/main.py index 21aa82b75d..118bb20474 100644 --- a/dnf/automatic/main.py +++ b/dnf/automatic/main.py @@ -318,6 +318,7 @@ def main(args): try: conf = AutomaticConfig(opts.conf_path, opts.downloadupdates, opts.installupdates) + emitters = build_emitters(conf) with dnf.Base() as base: cli = dnf.cli.Cli(base) cli._read_conf_file() @@ -351,7 +352,6 @@ def main(args): return 0 lst = output.list_transaction(trans, total_width=80) - emitters = build_emitters(conf) emitters.notify_available(lst) if not conf.commands.download_updates: emitters.commit() @@ -379,8 +379,8 @@ def main(args): (conf.commands.reboot == 'when-needed' and base.reboot_needed())): exit_code = os.waitstatus_to_exitcode(os.system(conf.commands.reboot_command)) if exit_code != 0: - raise dnf.exceptions.Error('reboot command returned nonzero exit code: %d', exit_code) - except dnf.exceptions.Error as exc: + raise dnf.exceptions.Error('reboot command returned nonzero exit code: %d' % exit_code) + except Exception as exc: logger.error(_('Error: %s'), ucd(exc)) if conf is not None and conf.emitters.send_error_messages and emitters is not None: emitters.notify_error(_('Error: %s') % str(exc)) diff --git a/doc/command_ref.rst b/doc/command_ref.rst index fd4a665503..ebbb6d6a76 100644 --- a/doc/command_ref.rst +++ b/doc/command_ref.rst @@ -165,11 +165,13 @@ Options .. _disableexcludes-label: ``--disableexcludes=[all|main|], --disableexcludepkgs=[all|main|]`` - Disable the configuration file excludes. Takes one of the following three options: + Disable ``excludepkgs`` and ``includepkgs`` configuration options. Takes one of the following three options: - * ``all``, disables all configuration file excludes - * ``main``, disables excludes defined in the ``[main]`` section - * ``repoid``, disables excludes defined for the given repository + * ``all``, disables all ``excludepkgs`` and ``includepkgs`` configurations + * ``main``, disables ``excludepkgs`` and ``includepkgs`` defined in the ``[main]`` section + * ``repoid``, disables ``excludepkgs`` and ``includepkgs`` defined for the given repository + + Note that the \-\ :ref:`-exclude ` option appends to the ``[main]`` ``excludepkgs`` configuration and therefore is disabled when ``main`` or ``all`` is specified. ``--disable, --set-disabled`` Disable specified repositories (automatically saves). The option has to be used together with the diff --git a/po/ko.po b/po/ko.po index 2a3439e41e..394aafee16 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,9 +1,7 @@ # MinWoo Joh , 2015. #zanata # Eun-Ju Kim , 2016. #zanata # Ludek Janda , 2018. #zanata, 2020. -# simmon , 2021, 2022. -# Kim InSoo , 2022. -# 김인수 , 2022, 2023. +# 김인수 , 2021, 2022, 2023, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n"