From f4fcdaba8cfde61a1b80d5b72efb35b3531cd4e7 Mon Sep 17 00:00:00 2001
From: Earl Warren <contact@earl-warren.org>
Date: Sun, 30 Jul 2023 07:42:38 +0200
Subject: [PATCH] Revert "[GITEA] do not use deprecatedSettingFatal for
 cosmetic reasons"

This reverts commit 2de8602855140a5addb8a1d12405e90da4fe0f69.
---
 modules/setting/config_provider.go |  6 ++++++
 modules/setting/lfs.go             |  9 +--------
 modules/setting/lfs_test.go        | 24 ------------------------
 3 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/modules/setting/config_provider.go b/modules/setting/config_provider.go
index 78c505656b..86712792a7 100644
--- a/modules/setting/config_provider.go
+++ b/modules/setting/config_provider.go
@@ -322,6 +322,12 @@ func deprecatedSetting(rootCfg ConfigProvider, oldSection, oldKey, newSection, n
 	}
 }
 
+func deprecatedSettingFatal(rootCfg ConfigProvider, oldSection, oldKey, newSection, newKey, version string) {
+	if rootCfg.Section(oldSection).HasKey(oldKey) {
+		log.Fatal("Deprecated fallback `[%s]` `%s` present. Use `[%s]` `%s` instead. This fallback will be/has been removed in %s. Shutting down", oldSection, oldKey, newSection, newKey, version)
+	}
+}
+
 // deprecatedSettingDB add a hint that the configuration has been moved to database but still kept in app.ini
 func deprecatedSettingDB(rootCfg ConfigProvider, oldSection, oldKey string) {
 	if rootCfg.Section(oldSection).HasKey(oldKey) {
diff --git a/modules/setting/lfs.go b/modules/setting/lfs.go
index 4232b5115b..75463ce1e5 100644
--- a/modules/setting/lfs.go
+++ b/modules/setting/lfs.go
@@ -34,14 +34,7 @@ func loadLFSFrom(rootCfg ConfigProvider) error {
 	// Specifically default PATH to LFS_CONTENT_PATH
 	// DEPRECATED should not be removed because users maybe upgrade from lower version to the latest version
 	// if these are removed, the warning will not be shown
-	deprecatedSetting(rootCfg, "server", "LFS_CONTENT_PATH", "lfs", "PATH", "v1.19.0")
-
-	if val := sec.Key("LFS_CONTENT_PATH").String(); val != "" {
-		if lfsSec == nil {
-			lfsSec = rootCfg.Section("lfs")
-		}
-		lfsSec.Key("PATH").MustString(val)
-	}
+	deprecatedSettingFatal(rootCfg, "server", "LFS_CONTENT_PATH", "lfs", "PATH", "v1.19.0")
 
 	var err error
 	LFS.Storage, err = getStorage(rootCfg, "lfs", "", lfsSec)
diff --git a/modules/setting/lfs_test.go b/modules/setting/lfs_test.go
index 10c54fec0a..3313cae0eb 100644
--- a/modules/setting/lfs_test.go
+++ b/modules/setting/lfs_test.go
@@ -21,30 +21,6 @@ func Test_getStorageInheritNameSectionTypeForLFS(t *testing.T) {
 	assert.EqualValues(t, "minio", LFS.Storage.Type)
 	assert.EqualValues(t, "lfs/", LFS.Storage.MinioConfig.BasePath)
 
-	iniStr = `
-[server]
-LFS_CONTENT_PATH = path_ignored
-[lfs]
-PATH = path_used
-`
-	cfg, err = NewConfigProviderFromData(iniStr)
-	assert.NoError(t, err)
-	assert.NoError(t, loadLFSFrom(cfg))
-
-	assert.EqualValues(t, "local", LFS.Storage.Type)
-	assert.Contains(t, LFS.Storage.Path, "path_used")
-
-	iniStr = `
-[server]
-LFS_CONTENT_PATH = deprecatedpath
-`
-	cfg, err = NewConfigProviderFromData(iniStr)
-	assert.NoError(t, err)
-	assert.NoError(t, loadLFSFrom(cfg))
-
-	assert.EqualValues(t, "local", LFS.Storage.Type)
-	assert.Contains(t, LFS.Storage.Path, "deprecatedpath")
-
 	iniStr = `
 [storage.lfs]
 STORAGE_TYPE = minio