config checking: only test skippedPaths existence for user-added values, not defaults

2015-06-08 13:20:06 +02:00
parent 4989d1f991
commit c7f5318e43
4 changed files with 31 additions and 17 deletions
@@ -399,15 +399,21 @@ public:
 	return false;
    }

-    virtual int get(const string &name, string &value, const string &sk) const
+    virtual int get(const string &name, string &value, const string &sk,
+                    bool shallow) const
    {
 	typename vector<T*>::const_iterator it;
 	for (it = m_confs.begin();it != m_confs.end();it++) {
 	    if ((*it)->get(name, value, sk))
 		return true;
+            if (shallow)
+                break;
 	}
 	return false;
    }
+    virtual int get(const string &name, string &value, const string &sk) const {
+        return get(name, value, sk, false);
+    }

    virtual bool hasNameAnywhere(const string& nm) const
    {