blob: 96eb418952038c63751ae1c03a2007948cec9a77 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -05001From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 10 Jan 2017 14:11:30 +0200
4Subject: [PATCH] Do not read config files from $HOME
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 lib/rpmrc.c | 6 ++----
10 1 file changed, 2 insertions(+), 4 deletions(-)
11
12diff --git a/lib/rpmrc.c b/lib/rpmrc.c
13index 4ed991321..19fe80f98 100644
14--- a/lib/rpmrc.c
15+++ b/lib/rpmrc.c
16@@ -458,8 +458,7 @@ static void setDefaults(void)
17 if (!defrcfiles) {
18 defrcfiles = rstrscat(NULL, confdir, "/rpmrc", ":",
19 confdir, "/" RPMCANONVENDOR "/rpmrc", ":",
20- SYSCONFDIR "/rpmrc", ":",
21- "~/.rpmrc", NULL);
22+ SYSCONFDIR "/rpmrc", ":");
23 }
24
25 #ifndef MACROFILES
26@@ -471,8 +470,7 @@ static void setDefaults(void)
27 confdir, "/" RPMCANONVENDOR "/macros", ":",
28 SYSCONFDIR "/rpm/macros.*", ":",
29 SYSCONFDIR "/rpm/macros", ":",
30- SYSCONFDIR "/rpm/%{_target}/macros", ":",
31- "~/.rpmmacros", NULL);
32+ SYSCONFDIR "/rpm/%{_target}/macros", ":");
33 }
34 #else
35 macrofiles = MACROFILES;
36--
372.11.0
38