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