demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-10 13:21:53 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix UpgradeTool and enable default=all policy (#3607)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2023-05-12 22:22:38 +02:00 committed by GitHub
parent c2ce05a550
commit fbd7f9cbff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/upgradetool/src/main/java/org/openhab/core/tools/UpgradeTool.java
View File

@ -42,7 +42,8 @@ public class UpgradeTool {
Options options = new Options();
options.addOption(Option.builder().longOpt(OPT_DIR).desc("directory to process").numberOfArgs(1).build());
options.addOption(Option.builder().longOpt(OPT_COMMAND).numberOfArgs(1).desc("command to execute").build());
options.addOption(Option.builder().longOpt(OPT_COMMAND).numberOfArgs(1)
.desc("command to execute (executes all if omitted)").build());
options.addOption(Option.builder().longOpt(OPT_LOG).numberOfArgs(1).desc("log verbosity").build());
options.addOption(Option.builder().longOpt(OPT_FORCE).desc("force execution (even if already done)").build());
@ -73,9 +74,12 @@ public class UpgradeTool {
boolean force = commandLine.hasOption(OPT_FORCE) ? true : false;
Upgrader upgrader = new Upgrader(baseDir, force);
if (commandLine.hasOption(ITEM_COPY_UNIT_TO_METADATA)) {
if (!commandLine.hasOption(OPT_COMMAND)
|| ITEM_COPY_UNIT_TO_METADATA.equals(commandLine.getOptionValue(OPT_COMMAND))) {
upgrader.itemCopyUnitToMetadata();
} else if (commandLine.hasOption(LINK_UPGRADE_JS_PROFILE)) {
}
if (!commandLine.hasOption(OPT_COMMAND)
|| LINK_UPGRADE_JS_PROFILE.equals(commandLine.getOptionValue(OPT_COMMAND))) {
upgrader.linkUpgradeJsProfile();
}
}

4
tools/upgradetool/src/main/java/org/openhab/core/tools/internal/Upgrader.java
View File

@ -67,7 +67,7 @@ public class Upgrader {
}
public void itemCopyUnitToMetadata() {
if (checkUpgradeRecord(ITEM_COPY_UNIT_TO_METADATA)) {
if (!checkUpgradeRecord(ITEM_COPY_UNIT_TO_METADATA)) {
return;
}
Path itemJsonDatabasePath = Path.of(baseDir, "jsondb", "org.openhab.core.items.Item.json");
@ -125,7 +125,7 @@ public class Upgrader {
}
public void linkUpgradeJsProfile() {
if (checkUpgradeRecord(LINK_UPGRADE_JS_PROFILE)) {
if (!checkUpgradeRecord(LINK_UPGRADE_JS_PROFILE)) {
return;
}