opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  InitContainer: Do not copy if init is run from siteWar

Change-Id: Ie1f154659d5b7750273b50c85277d603c6d3cc8b
This commit is contained in:
David Pursehouse 2020-03-10 17:33:40 +09:00
commit 28c352e64a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/pgm/init/InitContainer.java
View File

@ -75,7 +75,11 @@ class InitContainer implements InitStep {
final boolean copy;
final Path siteWar = site.gerrit_war;
if (Files.exists(siteWar)) {
copy = ui.yesno(true, "Upgrade %s", siteWar);
if (Files.isSameFile(siteWar, myWar)) {
copy = false;
} else {
copy = ui.yesno(true, "Upgrade %s", siteWar);
}
} else {
copy = ui.yesno(true, "Copy %s to %s", myWar.getFileName(), siteWar);
if (copy) {