aboutsummaryrefslogtreecommitdiffstats
path: root/layerindex/update.py
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-07-28 18:19:02 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-05 00:31:23 +0100
commit93ce26f21cdbbd8a645792359cde87acf05144d7 (patch)
tree52293af05d70b1c12a9ff2fe99849a841179b290 /layerindex/update.py
parent1eebd6e5252401578b638d3ac541547a9471c0eb (diff)
downloadopenembedded-core-contrib-93ce26f21cdbbd8a645792359cde87acf05144d7.tar.gz
Ensure logger is passed into runcmd function or use sys.stderr.write
Otherwise it might not be defined when an error.needs to be printed. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'layerindex/update.py')
-rwxr-xr-xlayerindex/update.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/layerindex/update.py b/layerindex/update.py
index ea200c6eeb..5da061ad38 100755
--- a/layerindex/update.py
+++ b/layerindex/update.py
@@ -193,9 +193,9 @@ def main():
out = None
try:
if not os.path.exists(repodir):
- out = utils.runcmd("git clone %s %s" % (layer.vcs_url, urldir), fetchdir)
+ out = utils.runcmd("git clone %s %s" % (layer.vcs_url, urldir), fetchdir, logger=logger)
else:
- out = utils.runcmd("git fetch", repodir)
+ out = utils.runcmd("git fetch", repodir, logger=logger)
except Exception as e:
logger.error("Fetch of layer %s failed: %s" % (layer.name, str(e)))
failedrepos.append(layer.vcs_url)
@@ -208,12 +208,12 @@ def main():
logger.info("Fetching bitbake from remote repository %s" % settings.BITBAKE_REPO_URL)
if not os.path.exists(bitbakepath):
- out = utils.runcmd("git clone %s %s" % (settings.BITBAKE_REPO_URL, 'bitbake'), fetchdir)
+ out = utils.runcmd("git clone %s %s" % (settings.BITBAKE_REPO_URL, 'bitbake'), fetchdir, logger=logger)
else:
- out = utils.runcmd("git fetch", bitbakepath)
+ out = utils.runcmd("git fetch", bitbakepath, logger=logger)
try:
- (tinfoil, tempdir) = recipeparse.init_parser(settings, branch, bitbakepath, nocheckout=options.nocheckout)
+ (tinfoil, tempdir) = recipeparse.init_parser(settings, branch, bitbakepath, nocheckout=options.nocheckout, logger=logger)
except recipeparse.RecipeParseError as e:
logger.error(str(e))
sys.exit(1)
@@ -299,8 +299,8 @@ def main():
if layerbranch.vcs_last_rev != topcommit.hexsha or options.reload:
# Check out appropriate branch
if not options.nocheckout:
- out = utils.runcmd("git checkout origin/%s" % branchname, repodir)
- out = utils.runcmd("git clean -f -x", repodir)
+ out = utils.runcmd("git checkout origin/%s" % branchname, repodir, logger=logger)
+ out = utils.runcmd("git clean -f -x", repodir, logger=logger)
if not os.path.exists(layerdir):
if options.branch == 'master':