From a3012e1ca98132a4e273d363fe3302cd85c37f48 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 19 Jul 2009 09:49:36 -0700 Subject: Move MalformedUrl, VarExpandError into appropriate modules. (Bitbake rev: e616483b237dafff7f90ba1c09e9ee7c383a2e47) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/__init__.py | 8 +++----- bitbake/lib/bb/data.py | 3 +++ bitbake/lib/bb/fetch/__init__.py | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index aa0c6de311..3195e72a62 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py @@ -80,11 +80,9 @@ if "BBDEBUG" in os.environ: if level: bb.msg.set_debug_level(level) -class VarExpandError(Exception): - pass - -class MalformedUrl(Exception): - """Exception raised when encountering an invalid url""" +# For compatibility +from bb.fetch import MalformedUrl +from bb.data import VarExpandError ####################################################################### diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index d3058b9a1d..c3bb1a1f43 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -47,6 +47,9 @@ sys.path.insert(0,path) from bb import data_smart import bb +class VarExpandError(Exception): + pass + _dict_type = data_smart.DataSmart def init(): diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index cedf839860..875cda8929 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -29,6 +29,9 @@ import bb from bb import data from bb import persist_data +class MalformedUrl(Exception): + """Exception raised when encountering an invalid url""" + class FetchError(Exception): """Exception raised when a download fails""" -- cgit v1.2.3-54-g00ecf