[OE-core] [RFC PATCH 1/7] lib/oe/patch: fall back to patch if git apply fails

[Paul Barker]

On 25 November 2014 at 17:28, Paul Eggleton
<paul.eggleton at linux.intel.com> wrote:
> When PATCHTOOL = "git", git apply doesn't support fuzzy application, so
> if a patch requires that it's better to be able to apply it rather than
> just failing.
>
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> ---
>  meta/lib/oe/patch.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
> index b085c9d..788f465 100644
> --- a/meta/lib/oe/patch.py
> +++ b/meta/lib/oe/patch.py
> @@ -219,7 +219,11 @@ class GitApplyTree(PatchTree):
>              return _applypatchhelper(shellcmd, patch, force, reverse, run)
>          except CmdError:
>              shellcmd = ["git", "--git-dir=.", "apply", "-p%s" % patch['strippath']]
> -            return _applypatchhelper(shellcmd, patch, force, reverse, run)
> +            try:
> +                output = _applypatchhelper(shellcmd, patch, force, reverse, run)
> +            except CmdError:
> +                output = PatchTree._applypatch(self, patch, force, reverse, run)
> +            return output
>

Would this give a warning or other notification if the fallback to
'patch' is used? When developing patches it'd probably be good to know
whether they're exactly correct or not.

I haven't looked at _applypatchhelper or _applypatch so I'm not sure
if there's some notification hidden in there.

Cheers,

-- 
Paul Barker

Email: paul at paulbarker.me.uk
http://www.paulbarker.me.uk