Use pa_hashmap_remove_and_free() where appropriate

[pulseaudio] / git-version-gen

diff --git a/git-version-gen b/git-version-gen
index 1a3d13b9c60b477c981e92affe168783995ada36..724da666e0aef1e044d3a07442d679d18cfb196c 100755 (executable)
--- a/git-version-gen
+++ b/git-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2008-04-08.07.01
+scriptversion=2012-09-25.20
 
 # Copyright (C) 2007-2008 Free Software Foundation
 #
@@ -67,6 +67,7 @@ scriptversion=2008-04-08.07.01
 #      echo $(VERSION) > $@-t && mv $@-t $@
 # dist-hook:
 #      echo $(VERSION) > $(distdir)/.tarball-version
+#      echo $(VERSION) > $(distdir)/.version
 
 case $# in
     1) ;;
@@ -92,10 +93,19 @@ then
        && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2
 fi
 
+# This is presently used by the GNOME-OSTree build system; it
+# helps support the case where the meta-build system has already
+# determined the git revision, but we may not be able to run "git describe"
+# because we're inside a chroot.
+if test -n "$GIT_DESCRIBE_FOR_BUILD";
+then
+    v=$GIT_DESCRIBE_FOR_BUILD
+fi
+
 if test -n "$v"
 then
     : # use $v
-elif test -d .git \
+elif test -e .git \
     && v=`git describe --abbrev=4 --match='v[0-9]*' HEAD 2>/dev/null` \
     && [ -n "$v" ]
 then
@@ -132,7 +142,8 @@ then
 #    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
     :
 else
-    v=UNKNOWN
+    echo 1>&2 "$0: Failed to determine git revision"
+    exit 1
 fi
 
 v=`echo "$v" |sed 's/^v//'`