From b9d507cbcf8e946f8da2f3df3f40602bb539eab0 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 11 Jul 2019 10:55:41 -0400 Subject: [PATCH] Also skip detached plugin installation if a *.[jh]pl file exists. (#4100) --- core/src/main/java/hudson/PluginManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java index 856eca5dd3..4f640dfc78 100644 --- a/core/src/main/java/hudson/PluginManager.java +++ b/core/src/main/java/hudson/PluginManager.java @@ -602,7 +602,10 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas } void considerDetachedPlugin(String shortName) { - if (new File(rootDir, shortName + ".jpi").isFile() || new File(rootDir, shortName + ".hpi").isFile()) { + if (new File(rootDir, shortName + ".jpi").isFile() || + new File(rootDir, shortName + ".hpi").isFile() || + new File(rootDir, shortName + ".jpl").isFile() || + new File(rootDir, shortName + ".hpl").isFile()) { LOGGER.fine(() -> "not considering loading a detached dependency " + shortName + " as it is already on disk"); return; }