Patchwork scripts/combo-layer: specify branch when getting current revision

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 21, 2012, 1:17 p.m.
Message ID <1345555030-24506-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/35059/
State Accepted
Commit a3ddf39af7e7cd47156677d8ae753964ee582745
Headers show

Comments

Paul Eggleton - Aug. 21, 2012, 1:17 p.m.
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 <paul.eggleton@linux.intel.com>
---
 scripts/combo-layer |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
Saul Wold - Aug. 24, 2012, 6:19 p.m.
On 08/21/2012 06:17 AM, Paul Eggleton wrote:
> 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 <paul.eggleton@linux.intel.com>
> ---
>   scripts/combo-layer |    5 +++--
>   1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/combo-layer b/scripts/combo-layer
> index 448fe71..330faca 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)
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/scripts/combo-layer b/scripts/combo-layer
index 448fe71..330faca 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)