[yocto] [AB PATCH 11/22] yoctogit.py: Use self.srcdir, not local srcdir construct.

[Elizabeth Flanagan]

From: Beth Flanagan <elizabeth.flanagan at intel.com>

Since we're now constructing the objects srcdir property, there
is no need to use a local srcdir prop.

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
 .../buildbot/steps/source/yoctogit.py                        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
index fcbc2cb..1924612 100644
--- a/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
+++ b/lib/python2.7/site-packages/buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py
@@ -258,12 +258,6 @@ class YoctoGit(Source):
                 log.msg("Source step failed while running command %s" % cmd)
                 raise buildstep.BuildStepFailed()
         d.addCallback(lambda _: evaluateCommand(cmd))
-        if self.mirrordir:
-            mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
-            if self.mirrorexists:
-                srcdir=mirror
-            else: 
-                srcdir='source/'+self.repourl
         if "poky" in self.layername or \
            "oecore" in self.layername or \
            "eclipse" in self.layername:
@@ -275,7 +269,7 @@ class YoctoGit(Source):
         d.addCallback(lambda _: self.incremental())
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': srcdir,
+                                          {'fromdir': self.srcdir,
                                            'todir': todir,
                                            'logEnviron': self.logEnviron,
                                            'timeout': self.timeout,})
@@ -311,8 +305,6 @@ class YoctoGit(Source):
         # method probably won't work correctly crossing filesystems, so utilize 
         # movecopy with caution.
 
-        srcdir='source/'+self.repourl
-
         cmd = buildstep.RemoteCommand('mv', {'fromdir': self.workdir,
                                              'todir': self.storedir + '/' + self.getProperty("DEST") + '/' + 
                                                         str(int(time.time())) + '-'  + 
@@ -338,7 +330,7 @@ class YoctoGit(Source):
 
         def copy(_):
             cmd = buildstep.RemoteCommand('cpdir',
-                                          {'fromdir': srcdir,
+                                          {'fromdir': self.srcdir,
                                            'todir': todir,
                                            'logEnviron': self.logEnviron,
                                            'timeout': self.timeout,})
-- 
1.8.1.2