Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

clear queues after abort pending changes / do not restart after update all plugins

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-09-28 15:28:40 +02:00
parent 333579ef2a
commit 78b17c17e8
4 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -144,6 +144,7 @@ public class DefaultPluginManager implements PluginManager {
return getInstalled()
.stream()
.filter(p -> isUpdatable(p.getDescriptor().getInformation().getName()))
.filter(p -> !p.isMarkedForUninstall())
.collect(Collectors.toList());
}
@@ -285,22 +286,19 @@ public class DefaultPluginManager implements PluginManager {
PluginPermissions.manage().check();
pendingUninstallQueue.forEach(PendingPluginUninstallation::cancel);
pendingInstallQueue.forEach(PendingPluginInstallation::cancel);
pendingUninstallQueue.clear();
pendingInstallQueue.clear();
getInstalled().forEach(p -> p.setUninstallable(isUninstallable(p)));
}
@Override
public void updateAll() {
PluginPermissions.manage().check();
boolean pluginUpdated = false;
for (InstalledPlugin installedPlugin : getInstalled()) {
String pluginName = installedPlugin.getDescriptor().getInformation().getName();
if (isUpdatable(pluginName)) {
install(pluginName, false);
pluginUpdated = true;
}
}
if (pluginUpdated) {
restart("update all plugins");
}
}
}