Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
4376fded
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4376fded
编写于
8月 20, 2016
作者:
K
Keith Zantow
提交者:
Oleg Nenashev
8月 21, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-37438] - method to run setup wizard after Jenkins is modified (#2512)
上级
67347c3c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
7 deletion
+17
-7
core/src/main/java/jenkins/install/InstallUtil.java
core/src/main/java/jenkins/install/InstallUtil.java
+17
-7
未找到文件。
core/src/main/java/jenkins/install/InstallUtil.java
浏览文件 @
4376fded
...
...
@@ -40,6 +40,7 @@ import javax.annotation.Nonnull;
import
javax.inject.Provider
;
import
org.apache.commons.io.FileUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.kohsuke.accmod.Restricted
;
import
org.kohsuke.accmod.restrictions.NoExternalUse
;
...
...
@@ -69,6 +70,7 @@ public class InstallUtil {
// tests need this to be 1.0
private
static
final
VersionNumber
NEW_INSTALL_VERSION
=
new
VersionNumber
(
"1.0"
);
private
static
final
VersionNumber
FORCE_NEW_INSTALL_VERSION
=
new
VersionNumber
(
"0.0"
);
/**
* Simple chain pattern using iterator.next()
...
...
@@ -166,7 +168,7 @@ public class InstallUtil {
// Neither the top level config or the lastExecVersionFile have a version
// stored in them, which means it's a new install.
if
(
lastRunVersion
.
compareTo
(
NEW_INSTALL_VERSION
)
==
0
)
{
if
(
FORCE_NEW_INSTALL_VERSION
.
equals
(
lastRunVersion
)
||
lastRunVersion
.
compareTo
(
NEW_INSTALL_VERSION
)
==
0
)
{
Jenkins
j
=
Jenkins
.
getInstance
();
// Allow for skipping
...
...
@@ -181,11 +183,13 @@ public class InstallUtil {
}
}
// Edge case: used Jenkins 1 but did not save the system config page,
// the version is not persisted and returns 1.0, so try to check if
// they actually did anything
if
(!
j
.
getItemMap
().
isEmpty
()
||
!
j
.
getNodes
().
isEmpty
())
{
return
InstallState
.
UPGRADE
;
if
(!
FORCE_NEW_INSTALL_VERSION
.
equals
(
lastRunVersion
))
{
// Edge case: used Jenkins 1 but did not save the system config page,
// the version is not persisted and returns 1.0, so try to check if
// they actually did anything
if
(!
j
.
getItemMap
().
isEmpty
()
||
!
j
.
getNodes
().
isEmpty
())
{
return
InstallState
.
UPGRADE
;
}
}
return
InstallState
.
INITIAL_SECURITY_SETUP
;
...
...
@@ -227,7 +231,13 @@ public class InstallUtil {
File
lastExecVersionFile
=
getLastExecVersionFile
();
if
(
lastExecVersionFile
.
exists
())
{
try
{
return
FileUtils
.
readFileToString
(
lastExecVersionFile
);
String
version
=
FileUtils
.
readFileToString
(
lastExecVersionFile
);
// JENKINS-37438 blank will force the setup
// wizard regardless of current state of the system
if
(
StringUtils
.
isBlank
(
version
))
{
return
FORCE_NEW_INSTALL_VERSION
.
toString
();
}
return
version
;
}
catch
(
IOException
e
)
{
LOGGER
.
log
(
SEVERE
,
"Unexpected Error. Unable to read "
+
lastExecVersionFile
.
getAbsolutePath
(),
e
);
LOGGER
.
log
(
WARNING
,
"Unable to determine the last running version (see error above). Treating this as a restart. No plugins will be updated."
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录