From 0d4fc25212dfc2b949f2bc0763d77f353fabe8a8 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Tue, 30 Jun 2015 15:30:18 +1200 Subject: [PATCH] Don't fail on dupes in version specific files The rot won't be unwound for another 6-12 months, and we're not backporting all the infrastructure to do markers to older releases. So we need to warn only, rather than erroring, when encountering this situation. Change-Id: Ib63996b016f7f99f69ad1255c333cc2d1846cbdb --- jenkins/scripts/project-requirements-change.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/project-requirements-change.py b/jenkins/scripts/project-requirements-change.py index 7d20f3e8ee..40026f1264 100755 --- a/jenkins/scripts/project-requirements-change.py +++ b/jenkins/scripts/project-requirements-change.py @@ -68,8 +68,8 @@ class RequirementsList(object): if not name: # Comments and other unprocessed lines continue - if strict and name in reqs: - print("Requirement %s present in multiple files" % name) + print("Requirement %s present in multiple files" % name) + if strict and name in reqs and not '-py' in fname: self.failed = True reqs[name].update(r for (r, line) in entries)