diff options
| author | Milton Miller <miltonm@bga.com> | 2010-07-22 11:19:38 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-12 18:52:14 -0400 |
| commit | 55c640c3abff301eed5ee11c34a40bfe043c8c2d (patch) | |
| tree | 64f6ace6624494c2bdee3857dfc4cb6f40fe3d16 /scripts | |
| parent | 235caa235cb6f88fd04bc58a288f45463e5361c7 (diff) | |
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>
Diffstat (limited to 'scripts')
| -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() | |||
| 86 | 86 | ||
| 87 | # Check for mercurial and a mercurial repo. | 87 | # Check for mercurial and a mercurial repo. |
| 88 | if hgid=`hg id 2>/dev/null`; then | 88 | if hgid=`hg id 2>/dev/null`; then |
| 89 | tag=`printf '%s' "$hgid" | cut -d' ' -f2` | 89 | tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` |
| 90 | 90 | ||
| 91 | # Do we have an untagged version? | 91 | # Do we have an untagged version? |
| 92 | if [ -z "$tag" -o "$tag" = tip ]; then | 92 | if [ -z "$tag" -o "$tag" = tip ]; then |