Blame SOURCES/0312-cli-load-config-file-at-the-beginning.patch
|
|
a60cd7 |
From 079ca6cf8774ce4b510daa9423a3785007c6c1d7 Mon Sep 17 00:00:00 2001
|
|
|
a60cd7 |
From: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
a60cd7 |
Date: Mon, 17 Sep 2018 16:16:23 +0200
|
|
|
a60cd7 |
Subject: [PATCH] cli: load config file at the beginning
|
|
|
a60cd7 |
|
|
|
a60cd7 |
Resolves: #1618818
|
|
|
a60cd7 |
|
|
|
a60cd7 |
Signed-off-by: Matej Habrnal <mhabrnal@redhat.com>
|
|
|
a60cd7 |
---
|
|
|
a60cd7 |
src/cli/abrt-cli.c | 1 +
|
|
|
a60cd7 |
src/cli/list.c | 1 -
|
|
|
a60cd7 |
src/cli/report.c | 1 -
|
|
|
a60cd7 |
3 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
a60cd7 |
|
|
|
a60cd7 |
diff --git a/src/cli/abrt-cli.c b/src/cli/abrt-cli.c
|
|
|
a60cd7 |
index 360e4757e..6660923d4 100644
|
|
|
a60cd7 |
--- a/src/cli/abrt-cli.c
|
|
|
a60cd7 |
+++ b/src/cli/abrt-cli.c
|
|
|
a60cd7 |
@@ -122,6 +122,7 @@ int main(int argc, const char **argv)
|
|
|
a60cd7 |
#endif
|
|
|
a60cd7 |
|
|
|
a60cd7 |
abrt_init((char **)argv);
|
|
|
a60cd7 |
+ load_abrt_conf();
|
|
|
a60cd7 |
|
|
|
a60cd7 |
argv++;
|
|
|
a60cd7 |
argc--;
|
|
|
a60cd7 |
diff --git a/src/cli/list.c b/src/cli/list.c
|
|
|
a60cd7 |
index e688d2f49..5af42fb01 100644
|
|
|
a60cd7 |
--- a/src/cli/list.c
|
|
|
a60cd7 |
+++ b/src/cli/list.c
|
|
|
a60cd7 |
@@ -206,7 +206,6 @@ int cmd_list(int argc, const char **argv)
|
|
|
a60cd7 |
free_vector_of_problem_data(ci);
|
|
|
a60cd7 |
|
|
|
a60cd7 |
#if SUGGEST_AUTOREPORTING != 0
|
|
|
a60cd7 |
- load_abrt_conf();
|
|
|
a60cd7 |
if (!g_settings_autoreporting)
|
|
|
a60cd7 |
{
|
|
|
a60cd7 |
if (output)
|
|
|
a60cd7 |
diff --git a/src/cli/report.c b/src/cli/report.c
|
|
|
a60cd7 |
index a76923f22..c98d8cbf8 100644
|
|
|
a60cd7 |
--- a/src/cli/report.c
|
|
|
a60cd7 |
+++ b/src/cli/report.c
|
|
|
a60cd7 |
@@ -116,7 +116,6 @@ int cmd_report(int argc, const char **argv)
|
|
|
a60cd7 |
|
|
|
a60cd7 |
export_abrt_envvars(/*prog_prefix:*/ 0);
|
|
|
a60cd7 |
|
|
|
a60cd7 |
- load_abrt_conf();
|
|
|
a60cd7 |
free_abrt_conf_data();
|
|
|
a60cd7 |
|
|
|
a60cd7 |
int report_flags = 0;
|
|
|
a60cd7 |
--
|
|
|
a60cd7 |
2.17.2
|
|
|
a60cd7 |
|