summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-06-15 16:23:28 -0400
committerCliff Brake <cbrake@bec-systems.com>2010-06-15 16:23:28 -0400
commit1a8df1e6ddb95eb98f2d0b17e2855790ab710ea3 (patch)
treec889ef336def6a19fae92f8ebe27334d5afbf236
parentd7074fcd050246b0744595da23a9cd7602c34eb6 (diff)
gitver.bbclass: fix issue with detached heads
-rw-r--r--classes/gitver.bbclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass
index 5b4ba8d1e1..445067ec80 100644
--- a/classes/gitver.bbclass
+++ b/classes/gitver.bbclass
@@ -38,9 +38,12 @@ def get_git_pv(path, d, tagadjust=None):
mark_dependency(d, os.path.join(gitdir, "HEAD"))
ref = popen(["git", "symbolic-ref", "HEAD"])
- reffile = os.path.join(gitdir, ref)
- if ref and os.path.exists(reffile):
- mark_dependency(d, reffile)
+ if ref:
+ reffile = os.path.join(gitdir, ref)
+ if os.path.exists(reffile):
+ mark_dependency(d, reffile)
+ else:
+ mark_dependency(d, os.path.join(gitdir, "index"))
else:
# The ref might be hidden in packed-refs. Force a reparse if anything
# in the working copy changes.