| Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 1 | From 35381b6cd6c1b571bf7e6b0640de0f54dbf94386 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 10 Jan 2017 14:11:30 +0200 |
| 4 | Subject: [PATCH] Do not read config files from $HOME |
| 5 | |
| 6 | Upstream-Status: Inappropriate [oe-core specific] |
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 8 | --- |
| 9 | lib/rpmrc.c | 6 ++---- |
| 10 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 11 | |
| 12 | diff --git a/lib/rpmrc.c b/lib/rpmrc.c |
| 13 | index 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 | -- |
| 37 | 2.11.0 |
| 38 | |