diff options
| author |   Holger Hans Peter Freyther <zecke@selfish.org> | 2005-05-20 19:39:59 +0000 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2005-05-20 19:39:59 +0000 |
| commit | 33d7ebb1af8d5c9666946f2487fb7bef5c651656 (patch) | |
| tree | d44fc41ae82218af785f18074eb0c8a89b1bfd06 /lib | |
| parent | 39313e9749889bd43695e1b9adabb1c7f64dcc80 (diff) | |
| download | bitbake-33d7ebb1af8d5c9666946f2487fb7bef5c651656.tar.gz | |
bitbake/lib/bb/fetch.py:
-Warn when init is called without a data instance, we're not able to reorder
them as it would break bitbake <= 1.2.1 and OpenEmbedded
bitbake/lib/bb/parse/BBHandler.py:
-Do not call fetch.init without a data instance. This changes the AtiCore
problem the OE folks are seeing a bit...
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/fetch.py | 6 | ||||
| -rw-r--r-- | lib/bb/parse/BBHandler.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/bb/fetch.py b/lib/bb/fetch.py index 8567fbfd8..5e8d3ca12 100644 --- a/lib/bb/fetch.py +++ b/lib/bb/fetch.py @@ -74,6 +74,12 @@ def uri_replace(uri, uri_find, uri_replace, d): methods = [] def init(urls = [], d = None): + if d == None: + bb.error("BUG init called with None as data object!!!") + import traceback + traceback.print_stack() + return + for m in methods: m.urls = [] diff --git a/lib/bb/parse/BBHandler.py b/lib/bb/parse/BBHandler.py index 8e7f9c0c5..bab8295cb 100644 --- a/lib/bb/parse/BBHandler.py +++ b/lib/bb/parse/BBHandler.py @@ -361,7 +361,7 @@ def set_additional_vars(file, d, include): from bb import fetch try: - fetch.init(src_uri.split()) + fetch.init(src_uri.split(), d) except fetch.NoMethodError: pass except bb.MalformedUrl,e: |