summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-05 22:13:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-11 12:02:29 +0100
commitd3865958fa1f0403cafae11b32ce356589a35260 (patch)
tree7bfec3ab986c86b667895c98838e983540919af8
parentcc40e858d264e82bdac9a77f00ef03122f81402f (diff)
downloadpoky-d3865958fa1f0403cafae11b32ce356589a35260.tar.gz
lib/package_manager: Use shutil.copy instead of bb.utils.copyfile for intercepts
If the scripts/postinst-intercepts is owned by root/root then the copyfile() calls will fail due to chown issues. We don't care about ownership of these files so use shutil.copy() instead which won't perform any chown. (From OE-Core rev: f2c5f666140df29d97e2b1539e727d3609e9e4d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1a03c70c282b3445b93a4c70ea6d40a1778750c5) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py
index 8e7128b195..4d22bc0296 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -189,7 +189,7 @@ class PackageManager(object, metaclass=ABCMeta):
189 bb.utils.remove(self.intercepts_dir, True) 189 bb.utils.remove(self.intercepts_dir, True)
190 bb.utils.mkdirhier(self.intercepts_dir) 190 bb.utils.mkdirhier(self.intercepts_dir)
191 for intercept in postinst_intercepts: 191 for intercept in postinst_intercepts:
192 bb.utils.copyfile(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept))) 192 shutil.copy(intercept, os.path.join(self.intercepts_dir, os.path.basename(intercept)))
193 193
194 @abstractmethod 194 @abstractmethod
195 def _handle_intercept_failure(self, failed_script): 195 def _handle_intercept_failure(self, failed_script):