Address @jglick's comments: refactor ClassicPluginStrategy to use

BREAK_CYCLE, use the same getImpliedDependency method for multiple code
paths, @Restricted isMailerPresent
This commit is contained in:
kzantow committed 2016-03-15 14:17:39 -04:00
1 parent 5e8bb98ee0
commit 4e3295bb2c
3 files changed
+27 -28

No files matched your search

+1 -1
View File
@@ -1158,7 +1158,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
// JENKINS-33308 - automatically install implied/previously bundled dependencies for older plugins that may need them
for(PluginWrapper.Dependency previouslyBundledDependency : ClassicPluginStrategy.getPreviouslyBundledDependencies(p.requiredCore)) {
for(PluginWrapper.Dependency previouslyBundledDependency : ClassicPluginStrategy.getImpliedDependencies(p.name, p.requiredCore)) {
// if they aren't already installed, note the dependencies show 'need restart' messages if installed multiple times
// but it can't be prevented here
if(getPlugin(previouslyBundledDependency.shortName) == null) {