setlocalversion: fix version for untaged nontip mercurial revs

The manpage for cut says it will return all lines without the delimiter unless -s is specified. When I backed up my mecurial tree to generate modules, I found that the scm part of localversion was turning up blank. Signed-off-by: Milton Miller <[email protected]> Cc: Michal Marek <[email protected]> Cc: "Michał Górny" <[email protected]> Signed-off-by: Michal Marek <[email protected]>
ambv · Aug 12, 2010 · 55c640c · 55c640c
1 parent 235caa2
commit 55c640c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
@@ -86,7 +86,7 @@ scm_version()
 
 	# Check for mercurial and a mercurial repo.
 	if hgid=`hg id 2>/dev/null`; then
-		tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+		tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
 
 		# Do we have an untagged version?
 		if [ -z "$tag" -o "$tag" = tip ]; then