From 9926a79503c9bd6454c076f2b60cd577f6061e4d Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 19 Feb 2022 07:29:58 +0000
Subject: [PATCH] Using Borg version 1.1.17 as default. Version is now configurable via web client and json file.
---
borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
index e375483..f45429c 100644
--- a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
+++ b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/Configuration.kt
@@ -30,8 +30,6 @@
/**
* The borg version to install from github (optional).
*/
- // @JsonIgnore needed by client: ConfigurationserverTab.jsx fails otherwise (conflicting borgVersion fields).
- @JsonIgnore
var borgVersion: String? = null
/**
@@ -101,6 +99,7 @@
fun copyFrom(other: Configuration) {
borgCommand = other.borgCommand
+ borgVersion = other.borgVersion
maxArchiveContentCacheCapacityMb = other.maxArchiveContentCacheCapacityMb
showDemoRepos = other.showDemoRepos
}
@@ -123,6 +122,10 @@
return this
}
+ override fun toString(): String {
+ return "borgCommand=[$borgCommand], borgVersion=[$borgVersion], workingDir=[$workingDir], maxArchiveContentCacheCapacityMb=[$maxArchiveContentCacheCapacityMb], showDemoRepos=[$showDemoRepos]"
+ }
+
companion object {
/**
* Default dir name for restoring archives.
--
Gitblit v1.10.0