From 556c2b1a88e0e47421f1f4b6826ecac372913ad2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 17 Oct 2006 21:10:15 +0000 Subject: Fix CONFIG_PROTECT so that is works with symlinked directories for bug #151502. svn path=/main/trunk/; revision=4742 --- pym/portage_util.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pym/portage_util.py b/pym/portage_util.py index d07fe63c9..0e6d53956 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -848,9 +848,14 @@ class ConfigProtect(object): os.path.join(self.myroot, x.lstrip(os.path.sep))) mystat = None try: + """Use lstat so that anything, even a broken symlink can be + protected.""" if stat.S_ISDIR(os.lstat(ppath).st_mode): self._dirs.add(ppath) self.protect.append(ppath) + """Now use stat in case this is a symlink to a directory.""" + if stat.S_ISDIR(os.stat(ppath).st_mode): + self._dirs.add(ppath) except OSError: # If it doesn't exist, there's no need to protect it. pass @@ -861,9 +866,14 @@ class ConfigProtect(object): os.path.join(self.myroot, x.lstrip(os.path.sep))) mystat = None try: + """Use lstat so that anything, even a broken symlink can be + protected.""" if stat.S_ISDIR(os.lstat(ppath).st_mode): self._dirs.add(ppath) self.protectmask.append(ppath) + """Now use stat in case this is a symlink to a directory.""" + if stat.S_ISDIR(os.stat(ppath).st_mode): + self._dirs.add(ppath) except OSError: # If it doesn't exist, there's no need to mask it. pass -- cgit v1.2.3-1-g7c22