From 8daaabcc011a2bea23859148385e3e2a50234fc3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 5 Aug 2024 20:06:54 +0300 Subject: [PATCH] bridgev2/mxmain: don't suggest using ignore foreign tables flag --- bridge/bridge.go | 1 - bridgev2/matrix/mxmain/dberror.go | 1 - 2 files changed, 2 deletions(-) diff --git a/bridge/bridge.go b/bridge/bridge.go index 4af2470b..17a4a30c 100644 --- a/bridge/bridge.go +++ b/bridge/bridge.go @@ -710,7 +710,6 @@ func (br *Bridge) LogDBUpgradeErrorAndExit(name string, err error) { if sqlError := (&sqlite3.Error{}); errors.As(err, sqlError) && sqlError.Code == sqlite3.ErrCorrupt { os.Exit(18) } else if errors.Is(err, dbutil.ErrForeignTables) { - br.ZLog.Info().Msg("You can use --ignore-foreign-tables to ignore this error") br.ZLog.Info().Msg("See https://docs.mau.fi/faq/foreign-tables for more info") } else if errors.Is(err, dbutil.ErrNotOwned) { br.ZLog.Info().Msg("Sharing the same database with different programs is not supported") diff --git a/bridgev2/matrix/mxmain/dberror.go b/bridgev2/matrix/mxmain/dberror.go index 1c0f6381..0f6aa68c 100644 --- a/bridgev2/matrix/mxmain/dberror.go +++ b/bridgev2/matrix/mxmain/dberror.go @@ -64,7 +64,6 @@ func (br *BridgeMain) LogDBUpgradeErrorAndExit(name string, err error, message s if sqlError := (&sqlite3.Error{}); errors.As(err, sqlError) && sqlError.Code == sqlite3.ErrCorrupt { os.Exit(18) } else if errors.Is(err, dbutil.ErrForeignTables) { - br.Log.Info().Msg("You can use --ignore-foreign-tables to ignore this error") br.Log.Info().Msg("See https://docs.mau.fi/faq/foreign-tables for more info") } else if errors.Is(err, dbutil.ErrNotOwned) { br.Log.Info().Msg("Sharing the same database with different programs is not supported")