From: Zac Medico Date: Sun, 26 Nov 2006 12:50:52 +0000 (-0000) Subject: Update the dblink.isprotected() docstring. X-Git-Tag: v2.1.2~424 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7c31e808f7fee68104f32ec590029459521c4e8e;p=portage.git Update the dblink.isprotected() docstring. svn path=/main/trunk/; revision=5134 --- diff --git a/pym/portage.py b/pym/portage.py index 5d6970122..7513beb2b 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -6427,10 +6427,9 @@ class dblink: return False def isprotected(self, filename): - """Files are protected by CONFIG_PROTECT only if they are not identical - to the file that was originally installed (otherwise, the unmerge phase - can remove them). This allows the merge phase to replace files that - will eventually be unmerged anyway.""" + """In cases where an installed package in the same slot owns a + protected file that will be merged, bump the mtime on the installed + file in order to ensure that it isn't unmerged.""" if not self._config_protect.isprotected(filename): return False if self._installed_instance is None: