From 751fdf13b573dbd53e83297d85082b43c23156bb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 Aug 2007 08:09:02 +0000 Subject: [PATCH] cooker.py: Warn about malformed PREFERRED_PROVIDERS (#1072) [backport] --- lib/bb/cooker.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 8f4042c..c16709e 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -277,7 +277,11 @@ class BBCooker: # Handle PREFERRED_PROVIDERS for p in (bb.data.getVar('PREFERRED_PROVIDERS', localdata, 1) or "").split(): - (providee, provider) = p.split(':') + try: + (providee, provider) = p.split(':') + except: + bb.msg.error(bb.msg.domain.Provider, "Malformed option in PREFERRED_PROVIDERS variable: %s" % p) + continue if providee in self.status.preferred and self.status.preferred[providee] != provider: bb.msg.error(bb.msg.domain.Provider, "conflicting preferences for %s: both %s and %s specified" % (providee, provider, self.status.preferred[providee])) self.status.preferred[providee] = provider -- 2.7.4