[oe-commits] Andreas Oberritter : gitpkgv.bbclass: rename git_drop_tag_prefix to fix conflict

[git version control]

Module: openembedded.git
Branch: master
Commit: adbcb86d61737961154a8c1a531f41f27881259f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=adbcb86d61737961154a8c1a531f41f27881259f

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Fri Feb 11 20:51:43 2011 +0000

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 at opendreambox.org>
Acked-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Tom Rini <tom_rini at mentor.com>

---

 classes/gitpkgv.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/gitpkgv.bbclass b/classes/gitpkgv.bbclass
index d4b8287..bedceb9 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: