From 2a4e21f52fccea92880fc8af15fb03ec59c905b3 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Sun, 25 Jan 2015 19:32:04 +0000 Subject: [PATCH 61/93] [plugin] fix chrooted symlink handling _copy_symlink() needs to strip_sysroot(), not join_sysroot(), on a link target before handing it to _do_copy_path(). Signed-off-by: Bryn M. Reeves --- sos/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 9fa2802..3263eaa 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -285,7 +285,7 @@ class Plugin(object): # to absolute paths to pass to _do_copy_path. self._log_debug("normalized link target '%s' as '%s'" % (linkdest, absdest)) - self._do_copy_path(self.join_sysroot(absdest)) + self._do_copy_path(self.strip_sysroot(absdest)) self.copied_files.append({'srcpath': srcpath, 'dstpath': dstpath, -- 1.9.3