Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinston Prakash2012-12-18 12:41:05 -0500
committerWinston Prakash2012-12-18 12:41:05 -0500
commitc6f59f0bf065fb3a39393876205684a83c3d64d9 (patch)
tree236178182caf51f3441bbf21c0eec96560518b74
parent106dc4a364c4d64c8ae601119949c30b1b202f3d (diff)
downloadorg.eclipse.hudson.core-c6f59f0bf065fb3a39393876205684a83c3d64d9.tar.gz
org.eclipse.hudson.core-c6f59f0bf065fb3a39393876205684a83c3d64d9.tar.xz
org.eclipse.hudson.core-c6f59f0bf065fb3a39393876205684a83c3d64d9.zip
Fix: Bug 396772 - New --skipInitSetup flag doesn't set the setup complete token
-rw-r--r--hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java b/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
index 1d79e958..4fd181ae 100644
--- a/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
+++ b/hudson-core/src/main/java/org/eclipse/hudson/init/InitialSetup.java
@@ -106,10 +106,19 @@ final public class InitialSetup {
}
public boolean needsInitSetup() {
- if (initSetupFile.exists() || Boolean.getBoolean("skipInitSetup")) {
+ if (initSetupFile.exists()) {
return false;
} else {
- return true;
+ if (Boolean.getBoolean("skipInitSetup")) {
+ try {
+ initSetupFile.write("Hudson 3.0 Initial Setup Done");
+ } catch (IOException ex) {
+ logger.error(ex.getLocalizedMessage());
+ }
+ return false;
+ } else {
+ return true;
+ }
}
}

Back to the top