From a3ddf39af7e7cd47156677d8ae753964ee582745 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 21 Aug 2012 14:17:10 +0100 Subject: scripts/combo-layer: specify branch when getting current revision Handle the case during update where the configured branch is not currently checked out in the component repository by just specifying it in the places where it was not previously. Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- scripts/combo-layer | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/combo-layer') diff --git a/scripts/combo-layer b/scripts/combo-layer index 448fe71cd9..330faca389 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -191,7 +191,7 @@ def action_init(conf, args): branch = repo.get('branch', "master") file_filter = repo.get('file_filter', "") runcmd("git archive %s | tar -x -C %s %s" % (branch, extract_dir, file_filter), ldir) - lastrev = runcmd("git rev-parse HEAD", ldir).strip() + lastrev = runcmd("git rev-parse %s" % branch, ldir).strip() conf.update(name, "last_revision", lastrev, initmode=True) runcmd("git add .") if conf.localconffile: @@ -475,7 +475,8 @@ def apply_patchlist(conf, repos): else: logger.info("No patches to apply from %s" % name) ldir = conf.repos[name]['local_repo_dir'] - lastrev = runcmd("git rev-parse HEAD", ldir).strip() + branch = conf.repos[name].get('branch', "master") + lastrev = runcmd("git rev-parse %s" % branch, ldir).strip() if lastrev != repo['last_revision']: conf.update(name, "last_revision", lastrev) -- cgit 1.2.3-korg