From dc624622c114b3c860a1a834d837c1bc85864c6c Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Mon, 13 Apr 2020 23:44:12 -0700 Subject: [PATCH] force harder on sourceppa. We need the force hinting here to modify the real excuses, otherwise it comes back around later. --- britney2/policies/sourceppa.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/britney2/policies/sourceppa.py b/britney2/policies/sourceppa.py index 35100c7..1d66467 100644 --- a/britney2/policies/sourceppa.py +++ b/britney2/policies/sourceppa.py @@ -91,8 +91,14 @@ class SourcePPAPolicy(BasePolicy, Rest): # checking in britney.py, otherwise /this/ package will later be # considered valid candidate but all the /others/ from the ppa will # be invalidated via this policy and not fixed by the force hint. - if self.hints.search('force', package=source_name, - version=source_data_srcdist.version): + forces = self.hints.search('force', package=source_name, + version=source_data_srcdist.version) + if forces: + excuse.dontinvalidate = True + if not excuse.is_valid: + excuse.addhtml("Should ignore, but forced by %s" % (forces[0].user)) + excuse.force() + excuse.is_valid = True accept = True shortppa = sourceppa.replace(LAUNCHPAD_URL, '')