From: Milton Miller <miltonm@bga.com>
Subject: [PATCH] setlocalversion: fix version for untaged nontip mercurial revs
To: Michal Marek <mmarek@suse.cz>, <gentoo@mgorny.alt.pl>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org
Message-Id: <fix-hg-id-resend1@mdm.bga.com>
Date: Thu, 22 Jul 2010 10:19:38 -0500
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1330
Lines: 36

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@bga.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: "Michał Górny" <gentoo@mgorny.alt.pl>

---
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@vger.kernel.org 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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/