From e0dca7536701a8b7669f7a0e0f16068bd9d75fdd Mon Sep 17 00:00:00 2001 From: Mustafa Gezen Date: Tue, 6 Apr 2021 00:12:30 +0200 Subject: [PATCH] Fix no patch directive cases --- internal/directives/spec_change.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/directives/spec_change.go b/internal/directives/spec_change.go index 0a16a2f..2f2a67c 100644 --- a/internal/directives/spec_change.go +++ b/internal/directives/spec_change.go @@ -210,6 +210,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _ inField := "" lastSource := "" lastPatch := "" + hasPatch := false version := "" importName := strings.Replace(pd.Importer.ImportName(pd, md), md.RpmFile.Name(), "1", 1) @@ -239,6 +240,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _ lastSource = field } else if strings.HasPrefix(field, "Patch") { lastPatch = field + hasPatch = true } else { for _, nf := range cfg.SpecChange.NewField { if field == nf.Key { @@ -364,7 +366,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _ return err } - if executed && !strings.Contains(specStr, "Patch") { + if executed && !hasPatch { newLines = append(newLines, "") inField = "Patch" }