[PATCH] setlocalversion: fix version for untaged nontip mercurial revs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <miltonm@xxxxxxx>
Cc: Michal Marek <mmarek@xxxxxxx>
Cc: "MichaÅ? Górny" <gentoo@xxxxxxxxxxxxx>

---
This version is against linux next-20100721.  The diff against 35-rc
would be shifted left one tab stop and have different line numbers, should
this be sent to stable.

Resend without 8-bit characters (maintainers name) in header
Added linux-kbuild@xxxxxxxxxxxxxxx which get-maintainer did not

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index a7b9f76..872312f 100755
--- 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux&nblp;USB Development]     [Linux Media]     [Video for Linux]     [Linux Audio Users]     [Yosemite Secrets]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux