Merge pull request #25 from rocky-linux/fix/deprecated_patch_format

nazunalika · web-flow · commit c0794a01b16b · 2024-06-24T13:22:03.000-07:00
Change patch directive to maximum compatible form
diff --git a/pkg/directives/spec_change.go b/pkg/directives/spec_change.go
@@ -107,7 +107,7 @@ func sourcePatchOperationAfterLoop(req *sourcePatchOperationAfterLoopRequest) (b
 				*req.newLines = append(*req.newLines, fmt.Sprintf("%s:%s%s", field, spaces, file.Name))
 
 				if req.expectedField == "Patch" && file.AddToPrep {
-					val := fmt.Sprintf("%%patch%d", fieldNum)
+					val := fmt.Sprintf("%%patch -P%d", fieldNum)
 					if file.NPath > 0 {
 						val = fmt.Sprintf("%s -p%d", val, file.NPath)
 					}

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func sourcePatchOperationAfterLoop(req *sourcePatchOperationAfterLoopRequest) (b`
`107`	`107`	`req.newLines = append(req.newLines, fmt.Sprintf("%s:%s%s", field, spaces, file.Name))`
`108`	`108`
`109`	`109`	`if req.expectedField == "Patch" && file.AddToPrep {`
`110`		`- val := fmt.Sprintf("%%patch%d", fieldNum)`
	`110`	`+ val := fmt.Sprintf("%%patch -P%d", fieldNum)`
`111`	`111`	`if file.NPath > 0 {`
`112`	`112`	`val = fmt.Sprintf("%s -p%d", val, file.NPath)`
`113`	`113`	`}`