Re: [gentoo-portage-dev] [PATCH] portage/__init__.py: Fix live versioning to look for portage tags only

[Brian Dolbec]

On Mon, 5 Dec 2016 13:00:36 -0800
Zac Medico <zmedico@g.o> wrote:

> On 12/05/2016 12:41 PM, Brian Dolbec wrote:
> > From 5074b2bfb36b6b9117f188588da55de3b5c01435 Mon Sep 17 00:00:00
> > 2001 From: Brian Dolbec <dolsen@g.o>
> > Date: Mon, 5 Dec 2016 11:56:02 -0800
> > Subject: [PATCH] portage/__init__.py: Fix live versioning to look
> > for portage tags only
> >
> > ---
> >  pym/portage/__init__.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
> > index 057dc6b..c8e8b56 100644
> > --- a/pym/portage/__init__.py
> > +++ b/pym/portage/__init__.py
> > @@ -631,7 +631,7 @@ if VERSION == 'HEAD':
> >  				return VERSION
> >  			if
> > os.path.isdir(os.path.join(PORTAGE_BASE_PATH, '.git')): encoding =
> > _encodings['fs']
> > -				cmd = [BASH_BINARY, "-c", ("cd
> > %s ; git describe --tags || exit $? ; " + \
> > +				cmd = [BASH_BINARY, "-c", ("cd
> > %s ; git describe --match 'portage-*' || exit $? ; " + \ "if [ -n
> > \"`git diff-index --name-only --diff-filter=M HEAD`\" ] ; " + \
> > "then echo modified ; git rev-list --format=%%ct -n 1 HEAD ; fi ; "
> > + \ "exit 0") % _shell_quote(PORTAGE_BASE_PATH)]
>
> LGTM

merged.

-- 
Brian Dolbec <dolsen>