diff options
| author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-11-20 07:00:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-11-20 07:00:54 +0000 |
| commit | 6beb31af1062b984250ee045621de453e936c2fd (patch) | |
| tree | 368a64a5cfd0953d53369cb955c10f4bfc42bc7d | |
| parent | cac9dfee214a5679bc99bee391ce518659a0a98e (diff) | |
| parent | cf417107693f15e171159697d572495854a4352e (diff) | |
Merge "InitPlugins: Suggest to upgrade installed plugins per default" into stable-2.11
| -rw-r--r-- | gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java index 72400a42b5..921f69e4f2 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java @@ -111,17 +111,18 @@ public class InitPlugins implements InitStep { String pluginName = plugin.name; try { final File tmpPlugin = plugin.pluginFile; + File p = new File(site.plugins_dir, plugin.name + ".jar"); + boolean upgrade = p.exists(); - if (!(initFlags.installPlugins.contains(pluginName) || ui.yesno(false, + if (!(initFlags.installPlugins.contains(pluginName) || ui.yesno(upgrade, "Install plugin %s version %s", pluginName, plugin.version))) { tmpPlugin.delete(); continue; } - final File p = new File(site.plugins_dir, plugin.name + ".jar"); - if (p.exists()) { + if (upgrade) { final String installedPluginVersion = getVersion(p); - if (!ui.yesno(false, + if (!ui.yesno(upgrade, "version %s is already installed, overwrite it", installedPluginVersion)) { tmpPlugin.delete(); |