commit: 36a7f18dcbea9072cd6e2d7d923a9c7b4638aab9
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 23:56:44 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 02:57:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=36a7f18d
portage.VERSION: compensate for new git tag format
pym/portage/__init__.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 427f79b..057dc6b 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -645,12 +645,12 @@ if VERSION == 'HEAD':
output_lines = output.splitlines()
if output_lines:
version_split =
output_lines[0].split('-')
- if version_split:
- VERSION =
version_split[0].lstrip('v')
+ if len(version_split) > 1:
+ VERSION =
version_split[1]
patchlevel = False
- if len(version_split) >
1:
+ if len(version_split) >
2:
patchlevel =
True
- VERSION =
"%s_p%s" % (VERSION, version_split[1])
+ VERSION =
"%s_p%s" % (VERSION, version_split[2])
if len(output_lines) >
1 and output_lines[1] == 'modified':
head_timestamp
= None
if
len(output_lines) > 3:
