From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9D9DB138330 for ; Thu, 8 Sep 2016 05:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2033321C18E; Thu, 8 Sep 2016 05:31:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B76521C18D for ; Thu, 8 Sep 2016 05:31:10 +0000 (UTC) Received: from naomi.gilbertsystems.net (d192-24-229-26.try.wideopenwest.com [24.192.26.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: floppym) by smtp.gentoo.org (Postfix) with ESMTPSA id 55365340688 for ; Thu, 8 Sep 2016 05:31:08 +0000 (UTC) From: Mike Gilbert To: gentoo-portage-dev@lists.gentoo.org Subject: [gentoo-portage-dev] [PATCH v5] news: Support News-Item-Format 2.0 Date: Thu, 8 Sep 2016 01:31:05 -0400 Message-Id: <20160908053105.3391-1-floppym@gentoo.org> X-Mailer: git-send-email 2.10.0 In-Reply-To: <2930a3f7-4caa-bd31-599b-4eda22f837ec@gentoo.org> References: <2930a3f7-4caa-bd31-599b-4eda22f837ec@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Archives-Salt: 7fe074af-ec87-437c-99ec-b1b557545345 X-Archives-Hash: 39f8fe204cf806869eeec6a746ce3936 Validate Display-If-Installed with EAPI 0 or 5. Add support for trailing wildcard matching for Display-If-Profile. Bug: https://bugs.gentoo.org/577372 --- pym/portage/news.py | 50 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/pym/portage/news.py b/pym/portage/news.py index 177f9db..28faf83 100644 --- a/pym/portage/news.py +++ b/pym/portage/news.py @@ -197,6 +197,7 @@ _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") +_valid_profile_RE = re.compile(r'^[^*]+(/\*)?$') class NewsItem(object): """ @@ -266,14 +267,24 @@ class NewsItem(object): f.close() self.restrictions = {} invalids = [] + news_format = None + + # Look for News-Item-Format 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 - not fnmatch.fnmatch(format_match.group(1), '1.*')): + if format_match is not None: + news_format = format_match.group(1) + if fnmatch.fnmatch(news_format, '[12].*'): + break invalids.append((i + 1, line.rstrip('\n'))) - break + + if news_format is None: + invalids.append((0, 'News-Item-Format unspecified')) + + # Parse the rest + for i, line in enumerate(lines): + # Optimization to ignore regex matches on lines that + # will never match if not line.startswith('D'): continue restricts = { _installedRE : DisplayInstalledRestriction, @@ -282,13 +293,14 @@ class NewsItem(object): for regex, restriction in restricts.items(): match = regex.match(line) if match: - restrict = restriction(match.groups()[0].strip()) + restrict = restriction(match.groups()[0].strip(), news_format) if not restrict.isValid(): invalids.append((i + 1, line.rstrip("\n"))) else: self.restrictions.setdefault( id(restriction), []).append(restrict) continue + if invalids: self._valid = False msg = [] @@ -321,13 +333,21 @@ class DisplayProfileRestriction(DisplayRestriction): if the user is running a specific profile. """ - def __init__(self, profile): + def __init__(self, profile, news_format): self.profile = profile + self.format = news_format + + def isValid(self): + if fnmatch.fnmatch(self.format, '1.*') and '*' in self.profile: + return False + if fnmatch.fnmatch(self.format, '2.*') and not _valid_profile_RE.match(self.profile): + return False + return True def checkRestriction(self, **kwargs): - if self.profile == kwargs['profile']: - return True - return False + if fnmatch.fnmatch(self.format, '2.*') and self.profile.endswith('/*'): + return (kwargs['profile'].startswith(self.profile[:-1])) + return (kwargs['profile'] == self.profile) class DisplayKeywordRestriction(DisplayRestriction): """ @@ -335,8 +355,9 @@ class DisplayKeywordRestriction(DisplayRestriction): if the user is running a specific keyword. """ - def __init__(self, keyword): + def __init__(self, keyword, news_format): self.keyword = keyword + self.format = news_format def checkRestriction(self, **kwargs): if kwargs['config'].get('ARCH', '') == self.keyword: @@ -349,10 +370,15 @@ class DisplayInstalledRestriction(DisplayRestriction): if the user has that item installed. """ - def __init__(self, atom): + def __init__(self, atom, news_format): self.atom = atom + self.format = news_format def isValid(self): + if fnmatch.fnmatch(self.format, '1.*'): + return isvalidatom(self.atom, eapi='0') + if fnmatch.fnmatch(self.format, '2.*'): + return isvalidatom(self.atom, eapi='5') return isvalidatom(self.atom) def checkRestriction(self, **kwargs): -- 2.10.0