Merge branch 'rpm-software-management:master' into progressive-galib/…

…update-readme.rst

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))

doc/command_ref.rst

@@ -165,11 +165,13 @@ Options
 .. _disableexcludes-label:
 
 ``--disableexcludes=[all|main|<repoid>], --disableexcludepkgs=[all|main|<repoid>]``
-    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 <exclude_option-label>` 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

po/ko.po

@@ -1,9 +1,7 @@
 # MinWoo Joh <[email protected]>, 2015. #zanata
 # Eun-Ju Kim <[email protected]>, 2016. #zanata
 # Ludek Janda <[email protected]>, 2018. #zanata, 2020.
-# simmon <[email protected]>, 2021, 2022.
-# Kim InSoo <[email protected]>, 2022.
-# 김인수 <[email protected]>, 2022, 2023.
+# 김인수 <[email protected]>, 2021, 2022, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"