From f2a2e263ed407b47f65057b618412422bf20599c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Apr 2019 09:48:56 +0100 Subject: [PATCH] Fix crash with None specifiers. --- cdist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdist b/cdist index 56e0527..c1618c9 100755 --- a/cdist +++ b/cdist @@ -55,10 +55,10 @@ class Trees: if t.name == name and t.specifier == specifier and t.target == target: return t elif t.name == name and t.specifier != specifier: - a = specifier + a = specifier if specifier is not None else "[Any]" if required_by is not None: a += ' by %s' % required_by - b = t.specifier + b = t.specifier if t.specifier is not None else "[Any]" if t.required_by is not None: b += ' by %s' % t.required_by raise Error('conflicting versions of %s required (%s versus %s)' % (name, a, b)) -- 2.30.2