path: root/layerindex/update_layer.py
diff options
authorRobert Yang <liezhi.yang@windriver.com>2018-07-09 11:28:38 +0800
committerRobert Yang <liezhi.yang@windriver.com>2018-07-09 12:06:31 +0800
commit8be7c6c9057c9b1d461aacfde8459adeddb348d5 (patch)
tree6baa7ec2da44eef5a31d7d209aa7785ecb1e9865 /layerindex/update_layer.py
parent80d1a821c96364c67d8bd0e48cddb7909adcfd71 (diff)
update.py: check whether branch existed when nocheckoutrbt/li_recs
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: <snip> 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 <liezhi.yang@windriver.com>
Diffstat (limited to 'layerindex/update_layer.py')
1 files changed, 1 insertions, 2 deletions
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