mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-01-04 15:58:49 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
79b7e059ea
1 changed files with 3 additions and 3 deletions
|
|
@ -483,13 +483,13 @@ func SetSyncProviderLocal(local *conf.Local) (err error) {
|
|||
return
|
||||
}
|
||||
if !gulu.File.IsExist(absPath) {
|
||||
msg := fmt.Sprintf("endpoint [%s] not exist", local.Endpoint+" ("+absPath+")")
|
||||
msg := fmt.Sprintf("endpoint [%s] not exist", local.Endpoint)
|
||||
logging.LogErrorf(msg)
|
||||
err = errors.New(fmt.Sprintf(Conf.Language(77), msg))
|
||||
return
|
||||
}
|
||||
if util.IsAbsPathInWorkspace(absPath) {
|
||||
msg := fmt.Sprintf("endpoint [%s] is in workspace", local.Endpoint+" ("+absPath+")")
|
||||
if util.IsAbsPathInWorkspace(absPath) || filepath.Clean(absPath) == filepath.Clean(util.WorkspaceDir) {
|
||||
msg := fmt.Sprintf("endpoint [%s] is in workspace", local.Endpoint)
|
||||
logging.LogErrorf(msg)
|
||||
err = errors.New(fmt.Sprintf(Conf.Language(77), msg))
|
||||
return
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue