diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2011-02-11 20:51:43 +0000 |
|---|---|---|
| committer |   Tom Rini <tom_rini@mentor.com> | 2011-02-12 07:58:54 -0700 |
| commit | adbcb86d61737961154a8c1a531f41f27881259f (patch) | |
| tree | 5a2e20b25c89b8ac2de26a9be6d83f5db85f790e /classes | |
| parent | 0e19b356cbe1710fa51b816dc6c485f7a5a0044c (diff) | |
| download | openembedded-adbcb86d61737961154a8c1a531f41f27881259f.tar.gz | |
gitpkgv.bbclass: rename git_drop_tag_prefix to fix conflict
* fixes ERROR: Error Method already seen: git_drop_tag_prefix in
'gitver.bbclass' now in 'gitpkgv.bbclass'
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/gitpkgv.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/gitpkgv.bbclass b/classes/gitpkgv.bbclass index d4b8287d3e..bedceb9d6e 100644 --- a/classes/gitpkgv.bbclass +++ b/classes/gitpkgv.bbclass @@ -40,7 +40,7 @@ GITPKGV = "${@get_git_pkgv(d, False)}" GITPKGVTAG = "${@get_git_pkgv(d, True)}" -def git_drop_tag_prefix(version): +def gitpkgv_drop_tag_prefix(version): import re if re.match("v\d", version): return version[1:] @@ -71,7 +71,7 @@ def get_git_pkgv(d, use_tags): if use_tags: try: - ver = git_drop_tag_prefix(bb.fetch.runfetchcmd("git describe %s 2>/dev/null" % rev, d, quiet=True).strip()) + ver = gitpkgv_drop_tag_prefix(bb.fetch.runfetchcmd("git describe %s 2>/dev/null" % rev, d, quiet=True).strip()) except Exception: ver = "0.0-%s-g%s" % (commits, rev[:7]) else: |