diff options
author | Chris Larson <clarson@kergoth.com> | 2009-07-19 09:49:36 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-22 14:53:55 +0000 |
commit | a3012e1ca98132a4e273d363fe3302cd85c37f48 (patch) | |
tree | 3486ad60d90a9defa16bed4f8b1e0e4220d92cad /bitbake | |
parent | 9a0da388cefb71fa7e9b015772c66625fdb70c1d (diff) | |
download | poky-a3012e1ca98132a4e273d363fe3302cd85c37f48.tar.gz |
Move MalformedUrl, VarExpandError into appropriate modules.
(Bitbake rev: e616483b237dafff7f90ba1c09e9ee7c383a2e47)
Signed-off-by: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/__init__.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/data.py | 3 | ||||
-rw-r--r-- | bitbake/lib/bb/fetch/__init__.py | 3 |
3 files changed, 9 insertions, 5 deletions
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: | |||
80 | if level: | 80 | if level: |
81 | bb.msg.set_debug_level(level) | 81 | bb.msg.set_debug_level(level) |
82 | 82 | ||
83 | class VarExpandError(Exception): | 83 | # For compatibility |
84 | pass | 84 | from bb.fetch import MalformedUrl |
85 | 85 | from bb.data import VarExpandError | |
86 | class MalformedUrl(Exception): | ||
87 | """Exception raised when encountering an invalid url""" | ||
88 | 86 | ||
89 | 87 | ||
90 | ####################################################################### | 88 | ####################################################################### |
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) | |||
47 | from bb import data_smart | 47 | from bb import data_smart |
48 | import bb | 48 | import bb |
49 | 49 | ||
50 | class VarExpandError(Exception): | ||
51 | pass | ||
52 | |||
50 | _dict_type = data_smart.DataSmart | 53 | _dict_type = data_smart.DataSmart |
51 | 54 | ||
52 | def init(): | 55 | 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 | |||
29 | from bb import data | 29 | from bb import data |
30 | from bb import persist_data | 30 | from bb import persist_data |
31 | 31 | ||
32 | class MalformedUrl(Exception): | ||
33 | """Exception raised when encountering an invalid url""" | ||
34 | |||
32 | class FetchError(Exception): | 35 | class FetchError(Exception): |
33 | """Exception raised when a download fails""" | 36 | """Exception raised when a download fails""" |
34 | 37 | ||