[JENKINS-55582] Refinement to at least handle nonstandard $JENKINS_HOME/plugins/$shortName.hpi and warn about $shortName-$version.hpi.

This commit is contained in:
Jesse Glick committed 2019-05-23 13:26:15 -04:00
1 parent 1f290ff1d0
commit 3bcdefcae4
6 files changed
+19 -1

No files matched your search

+1 -1
View File
@@ -601,7 +601,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
void considerDetachedPlugin(String shortName) {
if (new File(rootDir, shortName + ".jpi").isFile()) {
if (new File(rootDir, shortName + ".jpi").isFile() || new File(rootDir, shortName + ".hpi").isFile()) {
LOGGER.fine(() -> "not considering loading a detached dependency " + shortName + " as it is already on disk");
return;
}