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 | 29 |
1 files changed, 0 insertions, 29 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 deleted file mode 100644 index 3446f10422..0000000000 --- a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | guilt-push: Avoid duplicate hits in a series | ||
2 | |||
3 | If a series file becomes mangled and a patch name appears in there | ||
4 | more than once, then the guilt-push will fail a horrible and | ||
5 | incomprehensible death. Make it fail in a sensible way. | ||
6 | |||
7 | Upstream-Status: Inappropriate [oe-specific] | ||
8 | |||
9 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
10 | |||
11 | --- | ||
12 | |||
13 | guilt-push | 5 +++++ | ||
14 | 1 file changed, 5 insertions(+) | ||
15 | |||
16 | --- a/guilt-push | ||
17 | +++ b/guilt-push | ||
18 | @@ -90,6 +90,11 @@ else | ||
19 | if [ -z "$eidx" ]; then | ||
20 | die "Patch $patch is not in the series or is guarded." | ||
21 | fi | ||
22 | + | ||
23 | + matches=`echo $eidx | wc -w` | ||
24 | + if [ $matches -gt 1 ]; then | ||
25 | + die "Patch $patch is in the series multiple times" | ||
26 | + fi | ||
27 | fi | ||
28 | |||
29 | # make sure that there are no unapplied changes | ||