From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mail.openembedded.org (Postfix) with ESMTP id BC12F7290F for ; Fri, 19 Dec 2014 11:42:07 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 19 Dec 2014 03:42:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,606,1413270000"; d="scan'208";a="640244369" Received: from khamid-mobl1.ger.corp.intel.com (HELO peggleto-mobl5.ger.corp.intel.com) ([10.252.31.61]) by fmsmga001.fm.intel.com with ESMTP; 19 Dec 2014 03:42:08 -0800 From: Paul Eggleton To: openembedded-core@lists.openembedded.org Date: Fri, 19 Dec 2014 11:41:45 +0000 Message-Id: <36eb6715fbc62591dfa7723e45321159c8185f62.1418984743.git.paul.eggleton@linux.intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 03/15] lib/oe/patch: fall back to patch if git apply fails X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Dec 2014 11:42:09 -0000 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 --- 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 class QuiltTree(PatchSet): -- 1.9.3