summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/patch.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 16:31:22 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-16 23:32:39 +0100
commit1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch)
treeb2932a0d0d7146bde799db47497236063050fc84 /meta/lib/oe/patch.py
parent22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff)
downloadpoky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz
meta: python3 megapatch
This needs splutting into smaller units, WIP atm. (From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r--meta/lib/oe/patch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index add41045f3..a25fd527f6 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -434,7 +434,7 @@ class GitApplyTree(PatchTree):
434 # change other places which read it back 434 # change other places which read it back
435 f.write('echo >> $1\n') 435 f.write('echo >> $1\n')
436 f.write('echo "%s: $PATCHFILE" >> $1\n' % GitApplyTree.patch_line_prefix) 436 f.write('echo "%s: $PATCHFILE" >> $1\n' % GitApplyTree.patch_line_prefix)
437 os.chmod(commithook, 0755) 437 os.chmod(commithook, 0o755)
438 shutil.copy2(commithook, applyhook) 438 shutil.copy2(commithook, applyhook)
439 try: 439 try:
440 patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) 440 patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file'])
@@ -672,7 +672,7 @@ class UserResolver(Resolver):
672 f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n") 672 f.write("echo 'Run \"quilt refresh\" when patch is corrected, press CTRL+D to exit.'\n")
673 f.write("echo ''\n") 673 f.write("echo ''\n")
674 f.write(" ".join(patchcmd) + "\n") 674 f.write(" ".join(patchcmd) + "\n")
675 os.chmod(rcfile, 00775) 675 os.chmod(rcfile, 0o775)
676 676
677 self.terminal("bash --rcfile " + rcfile, 'Patch Rejects: Please fix patch rejects manually', self.patchset.d) 677 self.terminal("bash --rcfile " + rcfile, 'Patch Rejects: Please fix patch rejects manually', self.patchset.d)
678 678