Import patch tmpfile

diff --git a/bin/oe/make.py b/bin/oe/make.py
index c2db945..a95e08a 100644 (file)
--- 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 89ab9b5..78f44fe 100644 (file)
--- 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 9128edf..effd5e7 100644 (file)
--- 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

diff --git a/bin/oemake b/bin/oemake
index 4d6f6e4..ad3fdc6 100644 (file)
--- a/bin/oemake
+++ b/bin/oemake
@@ -282,33 +282,33 @@ if __name__ == "__main__":
             oe.fatal("Unable to open %s" % f)
 
     try:
-            make.cfg = oe.parse.handle("conf/oe.conf", make.cfg)
+        make.cfg = oe.parse.handle("conf/oe.conf", make.cfg)
     except IOError:
-            oe.fatal("Unable to open oe.conf")
+        oe.fatal("Unable to open oe.conf")
 
     if not oe.data.getVar("BUILDNAME", make.cfg):
-            oe.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), make.cfg)
+        oe.data.setVar("BUILDNAME", os.popen('date +%Y%m%d%H%M').readline().strip(), make.cfg)
 
     buildname = oe.data.getVar("BUILDNAME", make.cfg)
 
+    pkgs_to_build = None
+    if args:
+        if not pkgs_to_build:
+            pkgs_to_build = []
+        pkgs_to_build.extend(args)
+    if not pkgs_to_build:
+        oepkgs = oe.data.getVar('OEPKGS', make.cfg, 1)
+        if oepkgs:
+            pkgs_to_build = oepkgs.split()
+    if not pkgs_to_build:
+        print "nothing to build"
+        sys.exit(0)
+
     try:
         make.collect_oefiles( myProgressCallback )
        print
         build_depgraph()
 
-        pkgs_to_build = None
-        if args:
-            if not pkgs_to_build:
-                    pkgs_to_build = []
-            pkgs_to_build.extend(args)
-        if not pkgs_to_build:
-            oepkgs = oe.data.getVar('OEPKGS', make.cfg, 1)
-            if oepkgs:
-                    pkgs_to_build = oepkgs.split()
-        if not pkgs_to_build:
-            print "nothing to build"
-            sys.exit(0)
-
         if 'world' in pkgs_to_build:
             pkgs_to_build.remove('world')
             for t in __world_target: