diff options
| author | Milton Miller <miltonm@bga.com> | 2010-07-22 17:19:38 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-13 00:52:14 +0200 |
| commit | 55c640c3abff301eed5ee11c34a40bfe043c8c2d (patch) | |
| tree | 64f6ace6624494c2bdee3857dfc4cb6f40fe3d16 | |
| parent | Fix CONFIG_CROSS_COMPILE issue in .config (diff) | |
| download | linux-55c640c3abff301eed5ee11c34a40bfe043c8c2d.tar.xz linux-55c640c3abff301eed5ee11c34a40bfe043c8c2d.zip | |
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 <miltonm@bga.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: "Michał Górny" <gentoo@mgorny.alt.pl>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rwxr-xr-x | scripts/setlocalversion | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 64a9cb5556cd..e90a91cc5185 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 |