commit: 68ad3c50221023f6919d66a1d07d4976da037552 Author: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> AuthorDate: Wed May 18 08:24:13 2016 +0000 Commit: Alexander Berntsen <bernalex <AT> gentoo <DOT> org> CommitDate: Fri May 20 09:00:20 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=68ad3c50
news.py: Check only for major version when parsing Only check the major version of news items, as GLEP 42 specifies an upgrade path for them. Future revisions to news item formats may yield minor number increments. GLEP 42 further ensures that only forwards-compatible changes may incur, as incompatible changes demand a major version increment. X-Gentoo-Bug: 583560 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=583560 Suggested-by: Ulrich Müller <ulm <AT> gentoo.org> Signed-off-by: Alexander Berntsen <bernalex <AT> gentoo.org> Acked-by: Zac Medico <zmedico <AT> gentoo.org> pym/portage/news.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/portage/news.py b/pym/portage/news.py index 784ba70..ea1b947 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -9,6 +9,7 @@ __all__ = ["NewsManager", "NewsItem", "DisplayRestriction", "DisplayInstalledRestriction", "count_unread_news", "display_news_notifications"] +import fnmatch import io import logging import os as _os @@ -270,7 +271,8 @@ class NewsItem(object): # Optimization to ignore regex matchines on lines that # will never match format_match = _formatRE.match(line) - if format_match is not None and format_match.group(1) != '1.0': + if (format_match is not None and + not fnmatch.fnmatch(format_match.group(1), '1.*')): invalids.append((i + 1, line.rstrip('\n'))) break if not line.startswith('D'):
