linux-kernel - Re: [PATCH] setlocalversion: fix version for untaged nontip mercurial revs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 13 Aug 2010 00:56:13 +0200
From:	Michal Marek <mmarek@...e.cz>
To:	Milton Miller <miltonm@....com>
Cc:	gentoo@...rny.alt.pl, linux-kernel@...r.kernel.org,
	linux-kbuild@...r.kernel.org
Subject: Re: [PATCH] setlocalversion: fix version for untaged nontip
 mercurial revs

On Thu, Jul 22, 2010 at 10:19:38AM -0500, Milton Miller wrote:
> 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@....com>
> Cc: Michal Marek <mmarek@...e.cz>
> Cc: "Michał Górny" <gentoo@...rny.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@...r.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

Sorry, I somehow missed this patch. I applied it now.

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/