diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-07 11:23:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:00 +0100 |
commit | 297438e965053b2eb56cc8ef3e59465642f10a24 (patch) | |
tree | 74bd5fc54674b8cce870b35bd9e22d93eb00dcb6 /meta/lib/oe | |
parent | c77e7b86aa732e9acfa6409108756be38a3ca3ae (diff) | |
download | poky-297438e965053b2eb56cc8ef3e59465642f10a24.tar.gz |
classes/lib: Convert to use python3 octal syntax
The syntax for octal values changed in python3, adapt to it.
(From OE-Core rev: 737a095fcde773a36e0fee1f27b74aaa88062386)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package_manager.py | 4 | ||||
-rw-r--r-- | meta/lib/oe/patch.py | 4 | ||||
-rw-r--r-- | meta/lib/oe/sdk.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 79b3206621..3bc4ebf5b4 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -1090,8 +1090,8 @@ class RpmPM(PackageManager): | |||
1090 | native_root) | 1090 | native_root) |
1091 | open(self.scriptlet_wrapper, 'w+').write(scriptlet_content) | 1091 | open(self.scriptlet_wrapper, 'w+').write(scriptlet_content) |
1092 | 1092 | ||
1093 | bb.note("Configuring RPM cross-install scriptlet_wrapper") | 1093 | bb.note("configuring RPM cross-install scriptlet_wrapper") |
1094 | os.chmod(self.scriptlet_wrapper, 0755) | 1094 | os.chmod(self.scriptlet_wrapper, 0o755) |
1095 | cmd = 'config --set rpm-extra-macros._cross_scriptlet_wrapper=%s' % \ | 1095 | cmd = 'config --set rpm-extra-macros._cross_scriptlet_wrapper=%s' % \ |
1096 | self.scriptlet_wrapper | 1096 | self.scriptlet_wrapper |
1097 | self._invoke_smart(cmd) | 1097 | self._invoke_smart(cmd) |
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 9d36172909..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, 0775) | 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 | ||
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index f1bbef6f58..4786cc5aac 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
@@ -251,12 +251,12 @@ class OpkgSdk(Sdk): | |||
251 | self.mkdirhier(target_sysconfdir) | 251 | self.mkdirhier(target_sysconfdir) |
252 | shutil.copy(self.target_conf, target_sysconfdir) | 252 | shutil.copy(self.target_conf, target_sysconfdir) |
253 | os.chmod(os.path.join(target_sysconfdir, | 253 | os.chmod(os.path.join(target_sysconfdir, |
254 | os.path.basename(self.target_conf)), 0644) | 254 | os.path.basename(self.target_conf)), 0o644) |
255 | 255 | ||
256 | self.mkdirhier(host_sysconfdir) | 256 | self.mkdirhier(host_sysconfdir) |
257 | shutil.copy(self.host_conf, host_sysconfdir) | 257 | shutil.copy(self.host_conf, host_sysconfdir) |
258 | os.chmod(os.path.join(host_sysconfdir, | 258 | os.chmod(os.path.join(host_sysconfdir, |
259 | os.path.basename(self.host_conf)), 0644) | 259 | os.path.basename(self.host_conf)), 0o644) |
260 | 260 | ||
261 | native_opkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path, | 261 | native_opkg_state_dir = os.path.join(self.sdk_output, self.sdk_native_path, |
262 | self.d.getVar('localstatedir_nativesdk', True).strip('/'), | 262 | self.d.getVar('localstatedir_nativesdk', True).strip('/'), |