Merge ~vorlon/britney/+git/britney2-ubuntu:optimize-srcarch-check into ~ubuntu-release/britney/+git/britney2-ubuntu:master

[Steve Langasek]

Related to https://bugs.launchpad.net/britney/+bug/1904880

In a test, reduces runtime of 'code/b2/britney.py -c code/b2/britney.conf.ubuntu.impish -v --distribution=ubuntu --series=impish', which ~100 source packages in -proposed, from 30-45 minutes to 12-15 minutes.

Baseline testing should allow us to substantially reduce the number of hints, but in the meantime this is worth carrying as an Ubuntu delta.

[Michael Hudson-Doyle (mwhudson)]

It looks OK I guess. Given this is Ubuntu delta and we don't use remove hints in Ubuntu maybe we can just delete this block? But well a release team member can also think about that :)

[Steve Langasek (vorlon)]

Fair point; in that case, let's go for this updated branch, which drops the code here and also drops another call to hints.search('remove') in policy.py which lets us save another 12-16 minutes.

review: Approve

[Steve Langasek (vorlon)]

er, did not mean to self-approve this, re-requesting reviewers :)

[Steve Langasek (vorlon)]

review: Abstain

[Michael Hudson-Doyle (mwhudson)]

LGTM but my vote doesn't count for everything :)

review: Approve

[Brian Murray (brian-murray)]

review: Approve

diff --git a/britney2/excusefinder.py b/britney2/excusefinder.py
index 75b7497..0395303 100644
--- a/britney2/excusefinder.py
+++ b/britney2/excusefinder.py
@@ -97,18 +97,6 @@ class ExcuseFinder(object):
         source_u.section and excuse.set_section(source_u.section)
         excuse.set_distribution(self.options.distribution)
 
-        # if there is a `remove' hint and the requested version is the same as the
-        # version in testing, then stop here and return False
-        # (as a side effect, a removal may generate such excuses for both the source
-        # package and its binary packages on each architecture)
-        for hint in self.hints.search('remove', package=src, version=source_t.version):
-            excuse.add_hint(hint)
-            excuse.policy_verdict = PolicyVerdict.REJECTED_PERMANENTLY
-            excuse.add_verdict_info(excuse.policy_verdict, "Removal request by %s" % (hint.user))
-            excuse.add_verdict_info(excuse.policy_verdict, "Trying to remove package, not update it")
-            self.excuses[excuse.name] = excuse
-            return False
-
         # the starting point is that there is nothing wrong and nothing worth doing
         anywrongver = False
         anyworthdoing = False
diff --git a/britney2/policies/policy.py b/britney2/policies/policy.py
index 226ff50..a30f06d 100644
--- a/britney2/policies/policy.py
+++ b/britney2/policies/policy.py
@@ -1523,11 +1523,6 @@ class ImplicitDependencyPolicy(BasePolicy):
             # source for pkg not in unstable: candidate for removal
             return True
 
-        source_t = target_suite.sources[src]
-        for hint in self.hints.search('remove', package=src, version=source_t.version):
-            # removal hint for the source in testing: candidate for removal
-            return True
-
         if target_suite.is_cruft(pkg):
             # if pkg is cruft in testing, removal will be tried
             return True