[yocto] [AB PATCH 12/22] yoctogit.py: movecopy should only move 'build'

Elizabeth Flanagan elizabeth.flanagan at intel.com
Wed Mar 19 13:51:10 PDT 2014


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

Pin what movecopy moves to be 'build' and not workdir. This keeps
people from doing stupid stuff like passing in a weird workdir.

Signed-off-by: Beth Flanagan <elizabeth.flanagan at intel.com>
---
 .../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py        | 4 +---
 1 file changed, 1 insertion(+), 3 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 1924612..66bfb51 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
@@ -305,7 +305,7 @@ class YoctoGit(Source):
         # method probably won't work correctly crossing filesystems, so utilize 
         # movecopy with caution.
 
-        cmd = buildstep.RemoteCommand('mv', {'fromdir': self.workdir,
+        cmd = buildstep.RemoteCommand('mv', {'fromdir': 'build',
                                              'todir': self.storedir + '/' + self.getProperty("DEST") + '/' + 
                                                         str(int(time.time())) + '-'  + 
                                                         str(random.randrange(100, 100000, 2)) + 
@@ -322,10 +322,8 @@ class YoctoGit(Source):
            "oecore" in self.layername or \
            "eclipse" in self.layername:
             todir = "build"
-            self.workdir = 'source/'+self.repourl.rstrip('/')
         else:
             todir = "build/" + self.layername
-            self.workdir = 'source/'+self.repourl
         d.addCallback(lambda _: self.incremental())
 
         def copy(_):
-- 
1.8.1.2




More information about the yocto mailing list