[FIXED JENKINS-18654] exlude disabled plugins from transitive dependency list

This commit is contained in:
Nicolas De Loof committed 2013-07-08 11:45:26 +02:00
1 parent a832b3f9b8
commit a6926e1c51
1 file changed
+2 -2
@@ -536,7 +536,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
List<PluginWrapper> dep = new ArrayList<PluginWrapper>();
for (Dependency d : pw.getDependencies()) {
PluginWrapper p = pluginManager.getPlugin(d.shortName);
if (p!=null)
if (p!=null && p.isActive())
dep.add(p);
}
return dep;
@@ -546,7 +546,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
try {
for (Dependency d : dependencies) {
PluginWrapper p = pluginManager.getPlugin(d.shortName);
if (p!=null)
if (p!=null && p.isActive())
cgd.run(Collections.singleton(p));
}
} catch (CycleDetectedException e) {