From 30b986908eed5d8fd6a2b21da98878f2a0bf19c0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 19 Nov 2013 14:29:39 +0100 Subject: Check meta values and warn about bad ones --- src/libexpr/get-drvs.cc | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/libexpr/get-drvs.cc') diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc index 42776b22ac1c..0ed644e9bc5b 100644 --- a/src/libexpr/get-drvs.cc +++ b/src/libexpr/get-drvs.cc @@ -91,12 +91,30 @@ StringSet DrvInfo::queryMetaNames() } +bool DrvInfo::checkMeta(Value & v) +{ + state->forceValue(v); + if (v.type == tList) { + for (unsigned int n = 0; n < v.list.length; ++n) + if (!checkMeta(*v.list.elems[n])) return false; + return true; + } + else if (v.type == tAttrs) { + Bindings::iterator i = v.attrs->find(state->sOutPath); + if (i != v.attrs->end()) return false; + foreach (Bindings::iterator, i, *v.attrs) + if (!checkMeta(*i->value)) return false; + return true; + } + else return v.type == tInt || v.type == tBool || v.type == tString; +} + + Value * DrvInfo::queryMeta(const string & name) { if (!getMeta()) return 0; Bindings::iterator a = meta->find(state->symbols.create(name)); - if (a == meta->end()) return 0; - state->forceValue(*a->value); + if (a == meta->end() || !checkMeta(*a->value)) return 0; return a->value; } -- cgit 1.4.1