PatchTree and GitApplyTree now generate patch commands as argv lists when run=False.
Pass run through when pushing one patch and return the command without advancing the current patch state. Use shlex.join() when writing the command to the manual resolver's shell startup file. Reviewed-by: Daniel Turull <[email protected]> Signed-off-by: Anders Heimer <[email protected]> --- meta/lib/oe/patch.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index c76b78fcac..1d50e83ab7 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -277,7 +277,10 @@ class PatchTree(PatchSet): next = 0 bb.note("applying patch %s" % self.patches[next]) - ret = self._applypatch(self.patches[next], force) + ret = self._applypatch(self.patches[next], force, run=run) + + if not run: + return ret self._current = next return ret @@ -868,7 +871,7 @@ class UserResolver(Resolver): f.write("echo 'Dropping to a shell, so patch rejects can be fixed manually.'\n") f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n") f.write("echo ''\n") - f.write(" ".join(patchcmd) + "\n") + f.write(shlex.join(patchcmd) + "\n") os.chmod(rcfile, 0o775) self.terminal("bash --rcfile " + rcfile, 'Patch Rejects: Please fix patch rejects manually', self.patchset.d)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#239401): https://lists.openembedded.org/g/openembedded-core/message/239401 Mute This Topic: https://lists.openembedded.org/mt/119940620/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
