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