On (04/11/10 07:18), Chris Larson wrote: > From: Chris Larson <[email protected]> > > show-ref will show all matching refs, so a "show-ref HEAD" will show not just > the local HEAD, but the fetched remote ones as well. This isn't what we want > for this function, so change it to use rev-parse with --verify, and also > change it to use --short, to shorten the hash to a more palatable length. > > Signed-off-by: Chris Larson <[email protected]>
seems to hold on my limited testing Acked-by: Khem Raj <[email protected]> > --- > classes/metadata_scm.bbclass | 22 +++++++++++++--------- > 1 files changed, 13 insertions(+), 9 deletions(-) > > diff --git a/classes/metadata_scm.bbclass b/classes/metadata_scm.bbclass > index ffc6a8a..f79ea19 100644 > --- a/classes/metadata_scm.bbclass > +++ b/classes/metadata_scm.bbclass > @@ -63,14 +63,18 @@ def base_get_metadata_svn_revision(path, d): > return revision > > def base_get_metadata_git_branch(path, d): > - branch = os.popen('cd %s; PATH=%s git symbolic-ref HEAD 2>/dev/null' % > (path, d.getVar("PATH", 1))).read().rstrip() > - > - if len(branch) != 0: > - return branch.replace("refs/heads/", "") > - return "<unknown>" > + try: > + rev = oe_run(d, ["git", "symbolic-ref", "HEAD"], cwd=path).rstrip() > + except oe.process.CmdError: > + rev = "<unknown>" > + else: > + rev = rev.replace("refs/heads/", "") > + return rev > > def base_get_metadata_git_revision(path, d): > - rev = os.popen("cd %s; PATH=%s git show-ref HEAD 2>/dev/null" % (path, > d.getVar("PATH", 1))).read().split(" ")[0].rstrip() > - if len(rev) != 0: > - return rev > - return "<unknown>" > + try: > + rev = oe_run(d, ["git", "rev-parse", "--verify", "--short", "HEAD"], > + cwd=path).rstrip() > + except oe.process.CmdError: > + rev = "<unknown>" > + return rev > -- > 1.7.2.3 > > > _______________________________________________ > Openembedded-devel mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
