From 8abc8428f3534f46c3e334db251c473e6528f9dc Mon Sep 17 00:00:00 2001
From: JonRB <jon.roadleybattin@gmail.com>
Date: Sun, 26 Mar 2023 16:10:15 +0100
Subject: [PATCH] yaml/yml label file if/else guards

---
 modules/label/parser.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/label/parser.go b/modules/label/parser.go
index 55bf570de6b9..4a9117592958 100644
--- a/modules/label/parser.go
+++ b/modules/label/parser.go
@@ -6,6 +6,7 @@ package label
 import (
 	"errors"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/modules/options"
@@ -36,21 +37,20 @@ func (err ErrTemplateLoad) Error() string {
 // GetTemplateFile loads the label template file by given name,
 // then parses and returns a list of name-color pairs and optionally description.
 func GetTemplateFile(name string) ([]*Label, error) {
-	data, err := options.Labels(name + ".yaml")
-	if err == nil && len(data) > 0 {
-		return parseYamlFormat(name+".yaml", data)
-	}
-
-	data, err = options.Labels(name + ".yml")
-	if err == nil && len(data) > 0 {
-		return parseYamlFormat(name+".yml", data)
+	if ext := filepath.Ext(name); ext == ".yaml" || ext == ".yml" {
+		data, err := options.Labels(name)
+		if err == nil && len(data) > 0 {
+			return parseYamlFormat(name, data)
+		} else {
+			return nil, ErrTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)}
+		}
 	}
 
+	// Fall back to legacy format
 	data, err = options.Labels(name)
 	if err != nil {
 		return nil, ErrTemplateLoad{name, fmt.Errorf("GetRepoInitFile: %w", err)}
 	}
-
 	return parseLegacyFormat(name, data)
 }