|
 |
ac7294 |
From f60d1b6930b4602a24ae2ce4078795268384c87d Mon Sep 17 00:00:00 2001
|
|
|
ac7294 |
From: Pavla Kratochvilova <pkratoch@redhat.com>
|
|
|
ac7294 |
Date: Thu, 20 May 2021 11:06:27 +0200
|
|
|
ac7294 |
Subject: [PATCH] Revert "Don't set default value of "assumeyes" to TRUE"
|
|
|
ac7294 |
|
|
|
ac7294 |
This reverts commit 9e028a51fea6eceee0de6e155374a0bd81289e14.
|
|
|
ac7294 |
---
|
|
|
ac7294 |
dnf/dnf-main.c | 10 ++++++++++
|
|
|
ac7294 |
1 file changed, 10 insertions(+)
|
|
|
ac7294 |
|
|
|
ac7294 |
diff --git a/dnf/dnf-main.c b/dnf/dnf-main.c
|
|
|
ac7294 |
index 661dfee..cfaf714 100644
|
|
|
ac7294 |
--- a/dnf/dnf-main.c
|
|
|
ac7294 |
+++ b/dnf/dnf-main.c
|
|
|
ac7294 |
@@ -595,6 +595,14 @@ main (int argc,
|
|
|
ac7294 |
{
|
|
|
ac7294 |
dnf_conf_main_set_option ("assumeyes", DNF_CONF_COMMANDLINE, "1", NULL);
|
|
|
ac7294 |
}
|
|
|
ac7294 |
+ else
|
|
|
ac7294 |
+ {
|
|
|
ac7294 |
+ enum DnfConfPriority priority;
|
|
|
ac7294 |
+ dnf_utils_conf_main_get_bool_opt ("assumeyes", &priority);
|
|
|
ac7294 |
+ /* microdnf has a default value for "assumeyes" equal to TRUE, backward compatibility */
|
|
|
ac7294 |
+ if (priority == DNF_CONF_DEFAULT)
|
|
|
ac7294 |
+ dnf_conf_main_set_option ("assumeyes", DNF_CONF_COMMANDLINE, "1", NULL);
|
|
|
ac7294 |
+ }
|
|
|
ac7294 |
}
|
|
|
ac7294 |
|
|
|
ac7294 |
const gchar *cmd_name = get_command (&argc, argv);
|
|
|
ac7294 |
@@ -609,6 +617,8 @@ main (int argc,
|
|
|
ac7294 |
g_set_prgname (prg_name);
|
|
|
ac7294 |
g_autofree gchar *help = g_option_context_get_help (opt_ctx, TRUE, NULL);
|
|
|
ac7294 |
g_print ("%s", help);
|
|
|
ac7294 |
+ g_print ("Notes:\n");
|
|
|
ac7294 |
+ g_print (" The \"--assumeyes\" option is turned on by default. To switch it to an interactive prompt, specify \"assumeyes=0\" in the configuration file.\n\n");
|
|
|
ac7294 |
goto out;
|
|
|
ac7294 |
}
|
|
|
ac7294 |
|
|
|
ac7294 |
--
|
|
|
ac7294 |
libgit2 1.0.1
|
|
|
ac7294 |
|