summaryrefslogtreecommitdiffstats
path: root/meta/packages/guilt/files/guilt-push-no-series.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/guilt/files/guilt-push-no-series.patch')
-rw-r--r--meta/packages/guilt/files/guilt-push-no-series.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/packages/guilt/files/guilt-push-no-series.patch b/meta/packages/guilt/files/guilt-push-no-series.patch
new file mode 100644
index 0000000000..d40119c712
--- /dev/null
+++ b/meta/packages/guilt/files/guilt-push-no-series.patch
@@ -0,0 +1,27 @@
1guilt-push: Avoid duplicate hits in a series
2
3If a series file becomes mangled and a patch name appears in there
4more than once, then the guilt-push will fail a horrible and
5incomprehensible death. Make it fail in a sensible way.
6
7Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
8
9---
10
11 guilt-push | 5 +++++
12 1 file changed, 5 insertions(+)
13
14--- a/guilt-push
15+++ b/guilt-push
16@@ -90,6 +90,11 @@ else
17 if [ -z "$eidx" ]; then
18 die "Patch $patch is not in the series or is guarded."
19 fi
20+
21+ matches=`echo $eidx | wc -w`
22+ if [ $matches -gt 1 ]; then
23+ die "Patch $patch is in the series multiple times"
24+ fi
25 fi
26
27 # make sure that there are no unapplied changes