[gentoo-commits] proj/portage:master commit in: pym/portage/

[Brian Dolbec]

commit:     1540d5eb4d8ab7f6a4813462acf9774f1e7ecc0e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  5 19:56:02 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Dec  5 20:35:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=1540d5eb

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)]