[yocto] [yocto-autobuilder][PATCH 2/2] yoctogit.py: ensure mirrordir is set before trying to use it
Bill Randle
william.c.randle at intel.com
Sat Jul 23 08:11:05 PDT 2016
If OPTIMIZED_GIT_CLONE is False, it's possible for self.mirrordir to be
unset, which cause the _mirrorExists function to throw an exception. Check
that self.mirrordir is actually set before trying to use it.
[YOCTO #10010]
Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Bill Randle <william.c.randle at intel.com>
---
.../buildbot-0.8.8-py2.7.egg/buildbot/steps/source/yoctogit.py | 7 +++++--
1 file changed, 5 insertions(+), 2 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 850746f..5eb6158 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
@@ -596,8 +596,11 @@ class YoctoGit(Source):
return self.pathExists(self.build.path_module.join(self.workdir, '.git'))
def _mirrorExists(self):
- mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
- return self.pathExists(self.build.path_module.join(mirror, '.git'))
+ if self.mirrordir:
+ mirror = self.mirrordir + "/" + self.repourl.replace("git://", "") + "/"
+ return self.pathExists(self.build.path_module.join(mirror, '.git'))
+ else:
+ return None
def _updateSubmodule(self, _):
if self.submodules:
--
2.5.5
More information about the yocto
mailing list