diff options
Diffstat (limited to 'meta/recipes-devtools/guilt/files/guilt-push-no-series.patch')
| -rw-r--r-- | meta/recipes-devtools/guilt/files/guilt-push-no-series.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch new file mode 100644 index 0000000000..d40119c712 --- /dev/null +++ b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch @@ -0,0 +1,27 @@ +guilt-push: Avoid duplicate hits in a series + +If a series file becomes mangled and a patch name appears in there +more than once, then the guilt-push will fail a horrible and +incomprehensible death. Make it fail in a sensible way. + +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> + +--- + + guilt-push | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/guilt-push ++++ b/guilt-push +@@ -90,6 +90,11 @@ else + if [ -z "$eidx" ]; then + die "Patch $patch is not in the series or is guarded." + fi ++ ++ matches=`echo $eidx | wc -w` ++ if [ $matches -gt 1 ]; then ++ die "Patch $patch is in the series multiple times" ++ fi + fi + + # make sure that there are no unapplied changes |