opendev/gerrit
Code Issues Proposed changes

Improve output of .war name during site initialisation

Browse Source 
The init always refers to gerrit.war, although the actual name
of the file may be different.

Change it to display the actual name of the file that was used
to install.

Change-Id: Ifb05773570f9c2c842d851a98cd59947a2d34698
This commit is contained in:
David Pursehouse
2013-10-16 16:44:56 +09:00
parent 13b2190cc9
commit 455d7bc2b1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ class InitContainer implements InitStep {
try {
myWar = GerritLauncher.getDistributionArchive();
} catch (FileNotFoundException e) {
System.err.println("warn: Cannot find gerrit.war");
System.err.println("warn: Cannot find distribution archive (e.g. gerrit.war)");
myWar = null;
}
@@ -75,7 +75,7 @@ class InitContainer implements InitStep {
if (siteWar.exists()) {
copy = ui.yesno(true, "Upgrade %s", siteWar.getPath());
} else {
copy = ui.yesno(true, "Copy gerrit.war to %s", siteWar.getPath());
copy = ui.yesno(true, "Copy %s to %s", myWar.getName(), siteWar.getPath());
if (copy) {
container.unset("war");
} else {
@@ -84,7 +84,7 @@ class InitContainer implements InitStep {
}
if (copy) {
if (!ui.isBatch()) {
System.err.format("Copying gerrit.war to %s", siteWar.getPath());
System.err.format("Copying %s to %s", myWar.getName(), siteWar.getPath());
System.err.println();
}