On Tuesday 21 August 2012 11:40:55 Paul Eggleton wrote: > If the user selects not to pull the component repos, at least ensure > that the correct branch is checked out before proceeding. > > Signed-off-by: Paul Eggleton <[email protected]> > --- > scripts/combo-layer | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/scripts/combo-layer b/scripts/combo-layer > index 448fe71..6134e81 100755 > --- a/scripts/combo-layer > +++ b/scripts/combo-layer > @@ -356,6 +356,10 @@ def action_update(conf, args): > branch = repo.get('branch', "master") > repo_patch_dir = os.path.join(os.getcwd(), patch_dir, name) > > + if conf.nopull: > + # Need to do this here as we didn't call action_pull that would > do it otherwise + runcmd("git checkout %s" % branch, ldir) > + > # Step 2: generate the patch list and store to patch dir > logger.info("Generating patches from %s..." % name) > if dest_dir != ".":
Actually as Richard points out we don't need to be doing the checkout here - we can just specify the branch in the one or two places where it isn't already specified. A different patch is on its way. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
