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