diff options
| author |   Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2004-04-23 21:23:55 +0000 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2004-04-23 21:23:55 +0000 |
| commit | fdbfa74eaa13448611f710cd071b2644cad25a87 (patch) | |
| tree | 402833adf029cd2ffe5beb99546ed25bf9855055 /bin/oe | |
| parent | adb4e15a0d2c884a4115ce8e40a5fda0ef384ca6 (diff) | |
| download | bitbake-fdbfa74eaa13448611f710cd071b2644cad25a87.tar.gz | |
Import patch tmpfile
Diffstat (limited to 'bin/oe')
| -rw-r--r-- | bin/oe/make.py | 5 | ||||
| -rw-r--r-- | bin/oe/parse/OEHandler.py | 4 | ||||
| -rw-r--r-- | bin/oe/parse/__init__.py | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/bin/oe/make.py b/bin/oe/make.py index c2db945ad..a95e08aed 100644 --- a/bin/oe/make.py +++ b/bin/oe/make.py @@ -65,9 +65,8 @@ def load_oefile( oefile ): parse.handle(oefile, oe) # read .oe data os.chdir(oldpath) return oe - except IOError, OSError: + finally: os.chdir(oldpath) - return None def collect_oefiles( progressCallback ): """Collect all available .oe build files""" @@ -121,6 +120,8 @@ def collect_oefiles( progressCallback ): except IOError: oe.error("opening %s" % f) pass + except oe.parse.SkipPackage: + pass def explode_version(s): import string diff --git a/bin/oe/parse/OEHandler.py b/bin/oe/parse/OEHandler.py index 89ab9b53d..78f44fef2 100644 --- a/bin/oe/parse/OEHandler.py +++ b/bin/oe/parse/OEHandler.py @@ -125,8 +125,8 @@ def handle(fn, d = {}, include = 0): if t: data.setVar('T', t, d) except Exception, e: - oe.error("executing anonymous function: %s" % e) - pass + oe.debug(1, "executing anonymous function: %s" % e) + raise data.delVar("__anonqueue", d) data.delVar("__anonfunc", d) diff --git a/bin/oe/parse/__init__.py b/bin/oe/parse/__init__.py index 9128edfd2..effd5e778 100644 --- a/bin/oe/parse/__init__.py +++ b/bin/oe/parse/__init__.py @@ -16,6 +16,9 @@ handlers = [] class ParseError(Exception): """Exception raised when parsing fails""" +class SkipPackage(Exception): + """Exception raised to skip this package""" + import ConfHandler ConfHandler.ParseError = ParseError import OEHandler |