OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-10 18:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3269 from stephenc/jenkins-45235

Browse Source 
[FIXED JENKINS-45235] When multiple update sites publish different versions, allow those versions to be seen
This commit is contained in:
Stephen Connolly authored and GitHub committed 2018-11-19 13:35:21 +00:00
2 parents 8d429ff13b 6dcf6637b1
commit 389c5a7e60
7 files changed
+84 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/src/main/java/hudson/PluginManager.java
+2 -2
View File
@@ -1813,7 +1813,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
for (Map.Entry<String,VersionNumber> requestedPlugin : parseRequestedPlugins(configXml).entrySet()) {
PluginWrapper pw = getPlugin(requestedPlugin.getKey());
if (pw == null) { // install new
UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey());
UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey(), requestedPlugin.getValue());
if (toInstall == null) {
LOGGER.log(WARNING, "No such plugin {0} to install", requestedPlugin.getKey());
continue;
@@ -1826,7 +1826,7 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
}
jobs.add(toInstall.deploy(true));
} else if (pw.isOlderThan(requestedPlugin.getValue())) { // upgrade
UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey());
UpdateSite.Plugin toInstall = uc.getPlugin(requestedPlugin.getKey(), requestedPlugin.getValue());
if (toInstall == null) {
LOGGER.log(WARNING, "No such plugin {0} to upgrade", requestedPlugin.getKey());
continue;