Simplified hasLabel

ChainsLunatic · ChainsLunatic · commit bcfd7230aefd · 2025-10-28T21:43:34.000+01:00
diff --git a/cmd/backup/stop_restart.go b/cmd/backup/stop_restart.go
@@ -92,12 +92,8 @@ func isSwarm(c interface {
 }
 
 func hasLabel(labels map[string]string, key, value string) bool {
-	if val, ok := labels[key]; ok {
-		if val == value {
-			return true
-		}
-	}
-	return false
+	val, ok := labels[key]
+	return ok && val == value
 }
 
 func checkStopLabels(labels map[string]string, stopDuringBackupLabelValue string, stopDuringBackupNoRestartLabelValue string) (bool, bool, error) {

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,8 @@ func isSwarm(c interface {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`func hasLabel(labels map[string]string, key, value string) bool {`
`95`		`- if val, ok := labels[key]; ok {`
`96`		`- if val == value {`
`97`		`- return true`
`98`		`- }`
`99`		`- }`
`100`		`- return false`
	`95`	`+ val, ok := labels[key]`
	`96`	`+ return ok && val == value`
`101`	`97`	`}`
`102`	`98`
`103`	`99`	`func checkStopLabels(labels map[string]string, stopDuringBackupLabelValue string, stopDuringBackupNoRestartLabelValue string) (bool, bool, error) {`