gitpkgv.bbclass: rename git_drop_tag_prefix to fix conflict
authorAndreas Oberritter <obi@opendreambox.org>
Fri, 11 Feb 2011 20:51:43 +0000 (20:51 +0000)
committerTom Rini <tom_rini@mentor.com>
Sat, 12 Feb 2011 14:58:54 +0000 (07:58 -0700)
* 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>
classes/gitpkgv.bbclass

index d4b8287..bedceb9 100644 (file)
@@ -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: