From 2d8b344da881ba708d8d3fd287b07699ae0e9d4e Mon Sep 17 00:00:00 2001
From: Kevin Atkinson <kevina@gnu.org>
Date: Mon, 5 Aug 2019 19:52:30 -0400
Subject: [PATCH] Return an error if a config file specified via an option can
 be found.

---
 common/config.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/config.cpp b/common/config.cpp
index f12ef4f2..8bdbdc63 100644
--- a/common/config.cpp
+++ b/common/config.cpp
@@ -1279,13 +1279,15 @@ namespace acommon {
       {
         insert_point_ = &first_;
         PosibErrBase pe = read_in_file(retrieve("per-conf-path"));
-        if (pe.has_err() && !pe.has_err(cant_read_file)) return pe;
+        if (pe.has_err() && (have("per-conf") || !pe.has_err(cant_read_file)))
+          return pe;
       }
       
       {
         insert_point_ = &first_;
         PosibErrBase pe = read_in_file(retrieve("conf-path"));
-        if (pe.has_err() && !pe.has_err(cant_read_file)) return pe;
+        if (pe.has_err() && (have("conf") || !pe.has_err(cant_read_file)))
+          return pe;
       }
 
       if (was_committed)