[yocto] [AB PATCH 17/27] BuildSet.py: Set workdir based on layer not order

[Elizabeth Flanagan]

workdir needs to be build/ for poky,oecore and build/layername
for everything else. doing if via location in list is bad.

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan at intel.com>
---
 lib/python2.7/site-packages/autobuilder/BuildSet.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/python2.7/site-packages/autobuilder/BuildSet.py b/lib/python2.7/site-packages/autobuilder/BuildSet.py
index 7973a23..19fbb00 100644
--- a/lib/python2.7/site-packages/autobuilder/BuildSet.py
+++ b/lib/python2.7/site-packages/autobuilder/BuildSet.py
@@ -55,7 +55,6 @@ class BuildSet():
                                       argdict=layer[layer.iterkeys().next()]))
                 elif step=="CheckOutLayers":
                 # All steps need the factory passed as the first param
-                    passed=0
                     for layer in layers:
                         kwargs=stepOrder[step]
                         layername=layer.iterkeys().next()
@@ -76,17 +75,15 @@ class BuildSet():
                             mode='full'
                             srcdir = 'source'                       
                             if str(os.environ.get('OPTIMIZED_GIT_CLONE')) == "True":
-                                if passed==0:
+                                if 'poky' in layername or 'oecore' in layername or 'eclipse' in layername:
                                     method='movecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
                                     mirrordir=os.environ.get('OGIT_MIRROR_DIR')
-                                    passed=1                              
                                 else:
                                     method='barecopy'
                                     storedir=os.environ.get('OGIT_TRASH_DIR')
                                     mirrordir=os.environ.get('OGIT_MIRROR_DIR')
-                                    passed=1                              
-                            if layername == "poky" or layername == 'oecore':
+                            if 'poky' in layername or 'oecore' in layername:
                                 workdir = 'build'
                             elif "eclipse-poky" in layername:
                                 workdir="build/" + layername
-- 
1.8.1.2