From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 18 Aug 2009 06:43:01 +0000 (-0000)
Subject: Bug #270866 - Validate News-Item-Format headers.
X-Git-Tag: v2.2_rc39~36
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81d34889d4f51ed52d8683e5837375b9c3840ee0;p=portage.git

Bug #270866 - Validate News-Item-Format headers.

svn path=/main/trunk/; revision=14086
---

diff --git a/pym/portage/news.py b/pym/portage/news.py
index a5e533fe1..f3482150d 100644
--- a/pym/portage/news.py
+++ b/pym/portage/news.py
@@ -186,6 +186,7 @@ class NewsManager(object):
 			if unread_lock:
 				unlockfile(unread_lock)
 
+_formatRE = re.compile("News-Item-Format:\s*([^\s]*)\s*$")
 _installedRE = re.compile("Display-If-Installed:(.*)\n")
 _profileRE = re.compile("Display-If-Profile:(.*)\n")
 _keywordRE = re.compile("Display-If-Keyword:(.*)\n")
@@ -259,6 +260,10 @@ class NewsItem(object):
 		for i, line in enumerate(lines):
 			# 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':
+				invalids.append((i + 1, line.rstrip('\n')))
+				break
 			if not line.startswith('D'):
 				continue
 			restricts = {  _installedRE : DisplayInstalledRestriction,