From 8be7c6c9057c9b1d461aacfde8459adeddb348d5 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 9 Jul 2018 11:28:38 +0800 Subject: update.py: check whether branch existed when nocheckout Fixed: Assume there is no master branch in hello layer: $ update.py -l hello -b master INFO: Skipping update of layer hello - branch master doesn't exist This is correct since hello layer doesn't have master branch, but when --nocheckout: $ update.py -l hello -b master --nocheckout [snip] INFO: Sorting layers for branch mater: WARNING: Cannot find required collections on branch master: WARNING: hello: LAYERDEPENDS: This is incorrect, this patch fixed the problem, now it skips it since the branch doesn't exists when --nocheckout. Signed-off-by: Robert Yang --- layerindex/update_layer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'layerindex/update_layer.py') diff --git a/layerindex/update_layer.py b/layerindex/update_layer.py index 81b730a80a..d941ae646f 100644 --- a/layerindex/update_layer.py +++ b/layerindex/update_layer.py @@ -362,10 +362,9 @@ def main(): # Collect repo info repo = git.Repo(repodir) assert repo.bare == False + topcommit = repo.commit('origin/%s' % branchname) if options.nocheckout: topcommit = repo.commit('HEAD') - else: - topcommit = repo.commit('origin/%s' % branchname) tinfoil = None tempdir = None -- cgit 1.2.3-korg