From 0a1fcd7910b50fe3e33debfb5b106d364e66eecc Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 6 Jun 2022 11:46:32 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=AF=E6=8C=81=E5=A4=9A=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=93=8D=E4=BD=9C=E4=B8=8D=E5=90=8C=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=90=8E=E4=BA=91=E7=AB=AF=E5=90=8C=E6=AD=A5=E5=90=88=E5=B9=B6?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/5092?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/osssync.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/model/osssync.go b/kernel/model/osssync.go index 81c0aa1df..fc0c1c9fc 100644 --- a/kernel/model/osssync.go +++ b/kernel/model/osssync.go @@ -205,6 +205,9 @@ func ossDownload(isBackup bool, localDirPath, cloudDirPath string, bootOrExit bo var tmpWroteFiles int var tmpTransferSize uint64 for upsert, _ := range upsertList { + if "/.siyuan/conf.json" == upsert { // 版本号不覆盖云端 + continue + } localUpsert := filepath.Join(localDirPath, upsert) var info os.FileInfo info, err = os.Stat(localUpsert)